summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-03 08:09:31 +0000
committerGerrit Code Review <review@openstack.org>2015-12-03 08:09:31 +0000
commitaa38180cf531d1c536cc8a3097eb2cb3be49bb02 (patch)
treee1e905582a3a0d69ab765bc717a1263e46247dde
parentf56476c2e1078e236d6ae4071214513aa4726924 (diff)
parent521712a262f79daa41f26efed7fa6c037fcc1c16 (diff)
Merge "Top Nav shouldn't include giant bottom margin"
-rw-r--r--openstack_dashboard/static/dashboard/scss/components/_navbar.scss6
-rw-r--r--openstack_dashboard/themes/default/bootstrap/components/_navbar.scss9
-rw-r--r--openstack_dashboard/themes/material/static/horizon/_styles.scss4
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 4eb7d62..6ef813e 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
@@ -12,3 +12,9 @@
12 vertical-align: middle; 12 vertical-align: middle;
13 } 13 }
14} 14}
15
16.topbar {
17 .navbar {
18 margin-bottom: 1px;
19 }
20}
diff --git a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
index 65baacc..a04c555 100644
--- a/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
+++ b/openstack_dashboard/themes/default/bootstrap/components/_navbar.scss
@@ -1,9 +1,9 @@
1.navbar { 1.navbar {
2 margin-bottom: 0;
3 border-top: none; 2 border-top: none;
4 border-right: none; 3 border-right: none;
5 border-left: none; 4 border-left: none;
6 5
6 // Specificity Required
7 .navbar-toggle { 7 .navbar-toggle {
8 border-color: transparent; 8 border-color: transparent;
9 } 9 }
@@ -13,3 +13,10 @@
13 margin-top: 2px; 13 margin-top: 2px;
14 } 14 }
15} 15}
16
17// Specificity required
18.topbar {
19 .navbar {
20 margin-bottom: 0;
21 }
22} \ 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 6d39a8c..39a963e 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -30,10 +30,6 @@
30 width: 100%; 30 width: 100%;
31 position: fixed; 31 position: fixed;
32 z-index: 4; 32 z-index: 4;
33
34 .navbar {
35 margin-bottom: 0;
36 }
37} 33}
38 34
39 35