[Navbar] Made the navbar spacing universal, also properly sized the l…

…oading icon
elastic · Feb 11, 2016 · 5259b63 · 5259b63
1 parent bcb4a0f
commit 5259b63
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/plugins/kibana/public/dashboard/styles/main.less b/src/plugins/kibana/public/dashboard/styles/main.less
@@ -6,9 +6,6 @@
   navbar[name="dashboard-options"] {
     padding-bottom: 0;
   }
-  navbar[name="dashboard-search"] {
-    padding-bottom: 10px;
-  }
 }
 
 dashboard-grid {

diff --git a/src/plugins/kibana/public/discover/styles/main.less b/src/plugins/kibana/public/discover/styles/main.less
@@ -5,9 +5,6 @@
   navbar[name="discover-options"] {
     padding-bottom: 0;
   }
-  navbar[name="discover-search"] {
-    padding-bottom: 10px;
-  }
 }
 
 .discover {

diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -69,9 +69,6 @@
     padding-bottom: 0;
   }
 
-  navbar[name="visualize-search"] {
-    padding-bottom: 6px;
-  }
 
   &-actions {
     margin-left: auto;

diff --git a/src/ui/public/styles/navbar.less b/src/ui/public/styles/navbar.less
@@ -6,7 +6,7 @@ navbar {
   max-height: @navbar-collapse-max-height;
   margin-bottom: @navbar-margin-bottom;
   // top and bottom padding are normally calcuated and stored in @navbar-padding-vertical, but flexbox
-  padding: 0 @navbar-padding-horizontal;
+  padding: 0 @navbar-padding-horizontal 6px @navbar-padding-horizontal;
   color: @navbar-default-color;
   background-color: @navbar-default-bg;
   border: none;
@@ -20,6 +20,11 @@ navbar {
     padding-right: @navbar-padding-horizontal;
   }
 
+  .navbar-text {
+    margin-top: 6px;
+    margin-bottom: 6px;
+  }
+
   // the "brand" that is displayed, usually on the left of the navbar
   > .name {
     align-self: center;