From e78735fadb7b6cb9e61a7424f42287bc0aed72d7 Mon Sep 17 00:00:00 2001
From: Khalah Jones-Golden <khasan222@gmail.com>
Date: Thu, 11 Feb 2016 16:58:14 -0400
Subject: [PATCH 1/2] [SearchBar] Fixed the height on the search bar

---
 src/plugins/kibana/public/visualize/editor/styles/_editor.less | 2 +-
 src/ui/public/styles/control_group.less                        | 2 +-
 src/ui/public/styles/navbar.less                               | 2 +-
 src/ui/public/styles/variables/bootstrap-mods.less             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
index 6a0468669c4f6..755dbfbf88447 100644
--- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -70,7 +70,7 @@
   }
 
   navbar[name="visualize-search"] {
-    padding-bottom: 10px;
+    padding-bottom: 6px;
   }
 
   &-actions {
diff --git a/src/ui/public/styles/control_group.less b/src/ui/public/styles/control_group.less
index 23cd303a065ce..3f21998996402 100644
--- a/src/ui/public/styles/control_group.less
+++ b/src/ui/public/styles/control_group.less
@@ -24,7 +24,7 @@
   }
 
   button {
-    padding: @padding-base-vertical @padding-base-horizontal;
+    padding: 4px 10px;
     font-size: @font-size-base;
     color: @control-group-link-color;
     background-color: @control-group-bg;
diff --git a/src/ui/public/styles/navbar.less b/src/ui/public/styles/navbar.less
index 5f61f1a841088..a38ea49c83a97 100644
--- 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: @padding-base-vertical @navbar-padding-horizontal;
+  padding: 0 @navbar-padding-horizontal;
   color: @navbar-default-color;
   background-color: @navbar-default-bg;
   border: none;
diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
index 0bd2885595b28..38ec3950ce84e 100644
--- a/src/ui/public/styles/variables/bootstrap-mods.less
+++ b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -332,7 +332,7 @@
 @navbar-height:                    45px;
 @navbar-margin-bottom:             0px;
 @navbar-border-radius:             @border-radius-base;
-@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-horizontal:        10px;
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
 @navbar-collapse-max-height:       340px;
 

From 5259b6300c755411d1d29c7b689de376a55d32b7 Mon Sep 17 00:00:00 2001
From: Khalah Jones-Golden <khasan222@gmail.com>
Date: Thu, 11 Feb 2016 18:33:57 -0400
Subject: [PATCH 2/2] [Navbar] Made the navbar spacing universal, also properly
 sized the loading icon

---
 src/plugins/kibana/public/dashboard/styles/main.less       | 3 ---
 src/plugins/kibana/public/discover/styles/main.less        | 3 ---
 .../kibana/public/visualize/editor/styles/_editor.less     | 3 ---
 src/ui/public/styles/navbar.less                           | 7 ++++++-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/plugins/kibana/public/dashboard/styles/main.less b/src/plugins/kibana/public/dashboard/styles/main.less
index ed8736f2090c0..fdbef55cfb0f1 100644
--- 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
index d947c95778308..ef6cb62f8b634 100644
--- 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
index 755dbfbf88447..773eeb9e7c494 100644
--- 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
index 44e360da900f2..20c0ef599c795 100644
--- 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;