From 171f835fc4adef4c5a8205bdda2e3db96ca943e4 Mon Sep 17 00:00:00 2001
From: Diana Whitten <hurgleburgler@gmail.com>
Date: Thu, 19 Nov 2015 16:20:28 -0700
Subject: [PATCH] Top and Bottom Padding should be removed from navbar-brand

When using a theme other than 'default', a custom logo that is too
big won't be sized to fit inside of the header exactly perfectly.
The 'default' theme does this.  The style just needs to be moved
outside of 'default' theme to be global.

Change-Id: I241e49ad94cba24592209f5f4f23eedeb0e592a6
Closes-Bug: #1518123
---
 .../dashboard/scss/components/_navbar.scss       | 16 +++++++++++++---
 .../default/bootstrap/components/_navbar.scss    | 12 ------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
index 8d641e0a9e..4eb7d62981 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
@@ -1,4 +1,14 @@
-.navbar-brand img {
-  max-height: $navbar-height;
-  vertical-align: middle;
+.navbar-brand {
+  padding: 0 $padding-small-horizontal;
+  margin: 0;
+  display: block;
+
+  // These allow the vertical centering to work properly
+  line-height: $navbar-height;
+  font-size: 0;
+
+  img {
+    max-height: $navbar-height;
+    vertical-align: middle;
+  }
 }
diff --git a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
index 6bc5206f5a..65baaccf36 100644
--- a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
+++ b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
@@ -1,15 +1,3 @@
-.navbar-brand {
-  display: block;
-  padding: 0 $padding-small-horizontal;
-
-  &:before {
-    content: '';
-    display: inline-block;
-    height: 100%;
-    vertical-align: middle;
-  }
-}
-
 .navbar {
   margin-bottom: 0;
   border-top: none;