From f0428cc6d4ec9c7c57e88cfc642f409aee6a9d7c Mon Sep 17 00:00:00 2001
From: Bianca Cheng Costanzo <get.bianca@gmail.com>
Date: Wed, 3 Jan 2018 16:19:59 +0100
Subject: [PATCH] Prototype layout to match sidebars throughout the app - not
 for production.

---
 app/api_topologies.go                |  4 +---
 client/app/scripts/components/app.js |  4 ++--
 client/app/styles/_base.scss         | 23 +++++++++++------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/api_topologies.go b/app/api_topologies.go
index 2a28a40ae..ca55673f5 100644
--- a/app/api_topologies.go
+++ b/app/api_topologies.go
@@ -201,7 +201,6 @@ func MakeRegistry() *Registry {
 			id:          processesID,
 			renderer:    render.ProcessWithContainerNameRenderer,
 			Name:        "Processes",
-			Rank:        1,
 			Options:     unconnectedFilter,
 			HideIfEmpty: true,
 		},
@@ -244,15 +243,14 @@ func MakeRegistry() *Registry {
 		},
 		APITopologyDesc{
 			id:          kubeControllersID,
-			parent:      podsID,
 			renderer:    render.KubeControllerRenderer,
 			Name:        "controllers",
+			Rank:        1,
 			Options:     []APITopologyOptionGroup{unmanagedFilter},
 			HideIfEmpty: true,
 		},
 		APITopologyDesc{
 			id:          servicesID,
-			parent:      podsID,
 			renderer:    render.PodServiceRenderer,
 			Name:        "services",
 			Options:     []APITopologyOptionGroup{unmanagedFilter},
diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js
index 15c5d251a..a14ab6ca0 100644
--- a/client/app/scripts/components/app.js
+++ b/client/app/scripts/components/app.js
@@ -204,10 +204,10 @@ class App extends React.Component {
                   </svg>
                 }
               </div>
-              <Search />
-              <Topologies />
               <ViewModeSelector />
+              <Topologies />
               <TimeControl />
+              <Search />
             </div>
           </div>
 
diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss
index 015c271d4..2fd2e0def 100644
--- a/client/app/styles/_base.scss
+++ b/client/app/styles/_base.scss
@@ -204,15 +204,16 @@ a {
 }
 
 .header {
-  padding: 15px 10px 0;
   pointer-events: none;
   width: 100%;
 
   .selectors {
-    display: flex;
-    position: relative;
+    position: fixed;
+    width: 400px;
+    height: -webkit-fill-available;
+    background: white;
     > * {
-      z-index: 20;
+      z-index: 1024;
       flex: 1 1;
     }
 
@@ -311,7 +312,6 @@ a {
 
 .topologies {
   margin: 0 4px;
-  display: flex;
 
   .topologies-item {
     margin: 0px 8px;
@@ -1489,7 +1489,7 @@ a {
 }
 
 .view-mode-selector, .time-control {
-  margin-left: 20px;
+  margin: 20px 0px 0px 20px;
 
   &-wrapper {
     pointer-events: all;
@@ -1519,11 +1519,10 @@ a {
 }
 
 .time-control {
-  margin-right: 20px;
+  margin: 0px 10px 10px 0px;
 
   &-controls {
     align-items: center;
-    justify-content: flex-end;
     display: flex;
   }
 
@@ -1632,7 +1631,7 @@ a {
   &-wrapper {
     margin: 0 8px;
     min-width: 160px;
-    text-align: right;
+    text-align: left;
   }
 
   &-disabled {
@@ -1668,7 +1667,7 @@ a {
     color: $text-secondary-color;
 
     &-icon {
-      margin-right: 0.5em;
+      margin-right: 1em;
     }
 
     &-hint {
@@ -1681,7 +1680,7 @@ a {
 
   &-input {
     overflow: hidden;
-    background: #fff;
+    background: $background-lighter-color;
     position: relative;
     z-index: 1;
     display: flex;
@@ -1749,7 +1748,7 @@ a {
   display: inline-block;
 
   & + .search-item {
-    margin-left: 4px;
+    margin-right: 4px;
   }
 
   & + .search-input-field {