From c0ea077fb4890a4212e1c517d5fc2369beb49773 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 18:33:55 -0800 Subject: [PATCH] Revert the statis navbar in mobile views--they're back to being fixed all the time --- docs/assets/css/bootstrap.css | 25 ++++++++++++------------- less/navbar.less | 19 +++++++------------ 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b45d7e101e..42ed6c7021 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; } diff --git a/less/navbar.less b/less/navbar.less index b82534e430..8f063b45c0 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -49,11 +49,17 @@ 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; } @@ -270,17 +276,6 @@ 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;