Browse Source

Merge "Top Nav shouldn't include giant bottom margin"

tags/9.0.0.0b1
Jenkins 3 years ago
parent
commit
aa38180cf5

+ 6
- 0
openstack_dashboard/static/dashboard/scss/components/_navbar.scss View File

@@ -12,3 +12,9 @@
12 12
     vertical-align: middle;
13 13
   }
14 14
 }
15
+
16
+.topbar {
17
+  .navbar {
18
+    margin-bottom: 1px;
19
+  }
20
+}

+ 8
- 1
openstack_dashboard/themes/default/bootstrap/components/_navbar.scss View File

@@ -1,9 +1,9 @@
1 1
 .navbar {
2
-  margin-bottom: 0;
3 2
   border-top: none;
4 3
   border-right: none;
5 4
   border-left: none;
6 5
 
6
+  // Specificity Required
7 7
   .navbar-toggle {
8 8
     border-color: transparent;
9 9
   }
@@ -13,3 +13,10 @@
13 13
     margin-top: 2px;
14 14
   }
15 15
 }
16
+
17
+// Specificity required
18
+.topbar {
19
+  .navbar {
20
+    margin-bottom: 0;
21
+  }
22
+}

+ 0
- 4
openstack_dashboard/themes/material/static/horizon/_styles.scss View File

@@ -30,10 +30,6 @@
30 30
   width: 100%;
31 31
   position: fixed;
32 32
   z-index: 4;
33
-
34
-  .navbar {
35
-    margin-bottom: 0;
36
-  }
37 33
 }
38 34
 
39 35
 

Loading…
Cancel
Save