mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 04:11:39 +02:00
Code Issues Releases Wiki Activity

Fixes #8749: prevent navbar nav from overlapping navbar toggle

Browse Source
This commit is contained in:
Mark Otto
2013-08-06 17:28:02 -07:00
parent 223e032150
commit c3ac95333d
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@@ -2811,7 +2811,6 @@ button.close {
} }
.navbar-nav { .navbar-nav {
margin-top: 10px;
margin-bottom: 15px; margin-bottom: 15px;
} }
@@ -2893,6 +2892,11 @@ button.close {
clear: both; clear: both;
} }
.navbar-toggle + .nav-collapse {
width: 100%;
margin-top: 50px;
}
@media (max-width: 768px) { @media (max-width: 768px) {
.nav-collapse-scrollable { .nav-collapse-scrollable {
max-height: 360px; max-height: 360px;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
less/navbar.less
View File

@@ -20,8 +20,6 @@
// ------------------------- // -------------------------
.navbar-nav { .navbar-nav {
// Space out from .navbar .brand and .btn-navbar when stacked in mobile views
margin-top: 10px;
margin-bottom: 15px; margin-bottom: 15px;
> li > a { > li > a {
@@ -93,8 +91,16 @@
padding-bottom: @navbar-padding-vertical; padding-bottom: @navbar-padding-vertical;
// Clear floated elements and prevent collapsing of padding // Clear floated elements and prevent collapsing of padding
.clearfix(); .clearfix();
// When there is no `.navbar-brand` present (which normally sits between the
// navbar brand and toggle), prevent the nav from overlapping the toggle.
.navbar-toggle + & {
width: 100%;
margin-top: @navbar-height;
}
} }
// Scrollable navbar navigation // Scrollable navbar navigation
// //
// Sometimes you might have too many links in your fixed navbar and you need to // Sometimes you might have too many links in your fixed navbar and you need to