]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Revert the statis navbar in mobile views--they're back to being fixed all the time
authorMark Otto <otto@github.com>
Mon, 18 Feb 2013 02:33:55 +0000 (18:33 -0800)
committerMark Otto <otto@github.com>
Mon, 18 Feb 2013 02:33:55 +0000 (18:33 -0800)
docs/assets/css/bootstrap.css
less/navbar.less

index b45d7e101ebd36b9ea38f3e591f593a5d8a37af5..42ed6c70212ab64caffc01b4df5da33753d5d5d9 100644 (file)
@@ -3170,9 +3170,21 @@ button.close {
 
 .navbar-fixed-top,
 .navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
   border-radius: 0;
 }
 
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
 .navbar .brand {
   display: inline-block;
   padding: 7px 15px;
@@ -3371,19 +3383,6 @@ button.close {
   .navbar-inverse .nav > .divider {
     border-right-color: #2f2f2f;
   }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: fixed;
-    right: 0;
-    left: 0;
-    z-index: 1030;
-  }
-  .navbar-fixed-top {
-    top: 0;
-  }
-  .navbar-fixed-bottom {
-    bottom: 0;
-  }
   .navbar .btn-navbar {
     display: none;
   }
index b82534e4304fe109e1e93adbf3f2f61e76ab007a..8f063b45c0aed29b3a5e7ac3c2182b0cd251bf39 100644 (file)
   border-radius: 0;
 }
 
-// Fixed navbars aren't fixed to start; that comes at >768px
+// Fix the top/bottom navbars when screen real estate supports it
 .navbar-fixed-top,
 .navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: @zindex-navbar-fixed;
   border-radius: 0;
 }
+.navbar-fixed-top    { top: 0; }
+.navbar-fixed-bottom { bottom: 0; }
 
 
 
     border-right-color: lighten(@navbar-inverse-bg, 5%);
   }
 
-  // Fix the top/bottom navbars when screen real estate supports it
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: fixed;
-    right: 0;
-    left: 0;
-    z-index: @zindex-navbar-fixed;
-  }
-  .navbar-fixed-top    { top: 0; }
-  .navbar-fixed-bottom { bottom: 0; }
-
   // Required to make the collapsing navbar work on regular desktops
   .navbar .btn-navbar {
     display: none;