rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Don't affix the fixed navbars in mobile views

Browse Source
This commit is contained in:
Mark Otto 2013-02-16 00:19:17 -08:00
parent d1aae5f82b
commit f38e50cdf1
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3116,21 +3116,9 @@ 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;
@ -3329,6 +3317,19 @@ 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;
} }

6
docs/assets/css/docs.css
View File

@ -10,7 +10,7 @@
body { body {
position: relative; /* For scrollyspy */ position: relative; /* For scrollyspy */
padding-top: 62px; /* Default height of navbar */ /* We add the padding to the body for >768px only */
} }
/* */ /* */
@ -534,9 +534,9 @@ input.focused {
/* Tablets and up */ /* Tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
/* Account for fixed navbar */ /* Account for fixed navbar (which is static to start) */
body { body {
padding-top: 50px; padding-top: 62px; /* Default height of navbar */
} }
/* Tweak display of docs jumbotrons */ /* Tweak display of docs jumbotrons */

19
less/navbar.less
View File

@ -49,17 +49,11 @@
border-radius: 0; border-radius: 0;
} }
// Fixed navbar // Fixed navbars aren't fixed to start; that comes at >768px
.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; }
@ -276,6 +270,17 @@
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;