From 521712a262f79daa41f26efed7fa6c037fcc1c16 Mon Sep 17 00:00:00 2001
From: Diana Whitten <hurgleburgler@gmail.com>
Date: Fri, 20 Nov 2015 14:41:11 -0700
Subject: [PATCH] Top Nav shouldn't include giant bottom margin

In the 'default' and 'material' themes, we remove the default bootstrap
margin on the top navbar because it creates a gap between the sidenav
and the topnav. This should be a global style so that other themes can
take advantage of it. It looks best with a single 1px value on
alternate themes.

Change-Id: Ie0f3e5e22c29fe737d128af6d2fd6499fe9ee99a
Closes-Bug: #1518455
---
 .../static/dashboard/scss/components/_navbar.scss        | 6 ++++++
 .../themes/default/bootstrap/components/_navbar.scss     | 9 ++++++++-
 .../themes/material/static/horizon/_styles.scss          | 4 ----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
index 4eb7d62981..6ef813e7e8 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
@@ -12,3 +12,9 @@
     vertical-align: middle;
   }
 }
+
+.topbar {
+  .navbar {
+    margin-bottom: 1px;
+  }
+}
diff --git a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
index 65baaccf36..a04c55583c 100644
--- a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
+++ b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
@@ -1,9 +1,9 @@
 .navbar {
-  margin-bottom: 0;
   border-top: none;
   border-right: none;
   border-left: none;
 
+  // Specificity Required
   .navbar-toggle {
     border-color: transparent;
   }
@@ -13,3 +13,10 @@
     margin-top: 2px;
   }
 }
+
+// Specificity required
+.topbar {
+  .navbar {
+    margin-bottom: 0;
+  }
+}
\ No newline at end of file
diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss
index 6d39a8c449..39a963e518 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -30,10 +30,6 @@
   width: 100%;
   position: fixed;
   z-index: 4;
-
-  .navbar {
-    margin-bottom: 0;
-  }
 }