rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Revert the statis navbar in mobile views--they're back to being fixed all the time

Browse Source
This commit is contained in:
Mark Otto 2013-02-17 18:33:55 -08:00
parent 4cbb663d9d
commit c0ea077fb4
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docs/assets/css/bootstrap.css vendored
View File

@ -3170,9 +3170,21 @@ button.close {
.navbar-fixed-top, .navbar-fixed-top,
.navbar-fixed-bottom { .navbar-fixed-bottom {
position: fixed;
right: 0;
left: 0;
z-index: 1030;
border-radius: 0; border-radius: 0;
} }
.navbar-fixed-top {
top: 0;
}
.navbar-fixed-bottom {
bottom: 0;
}
.navbar .brand { .navbar .brand {
display: inline-block; display: inline-block;
padding: 7px 15px; padding: 7px 15px;
@ -3371,19 +3383,6 @@ button.close {
.navbar-inverse .nav > .divider { .navbar-inverse .nav > .divider {
border-right-color: #2f2f2f; 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 { .navbar .btn-navbar {
display: none; display: none;
} }

19
less/navbar.less
View File

@ -49,11 +49,17 @@
border-radius: 0; 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-top,
.navbar-fixed-bottom { .navbar-fixed-bottom {
position: fixed;
right: 0;
left: 0;
z-index: @zindex-navbar-fixed;
border-radius: 0; 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%); 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 // Required to make the collapsing navbar work on regular desktops
.navbar .btn-navbar { .navbar .btn-navbar {
display: none; display: none;