mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Fixes #8749: prevent navbar nav from overlapping navbar toggle
This commit is contained in:
parent
223e032150
commit
c3ac95333d
6
dist/css/bootstrap.css
vendored
6
dist/css/bootstrap.css
vendored
@ -2811,7 +2811,6 @@ button.close {
|
||||
}
|
||||
|
||||
.navbar-nav {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
@ -2893,6 +2892,11 @@ button.close {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.navbar-toggle + .nav-collapse {
|
||||
width: 100%;
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.nav-collapse-scrollable {
|
||||
max-height: 360px;
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -20,8 +20,6 @@
|
||||
// -------------------------
|
||||
|
||||
.navbar-nav {
|
||||
// Space out from .navbar .brand and .btn-navbar when stacked in mobile views
|
||||
margin-top: 10px;
|
||||
margin-bottom: 15px;
|
||||
|
||||
> li > a {
|
||||
@ -93,8 +91,16 @@
|
||||
padding-bottom: @navbar-padding-vertical;
|
||||
// Clear floated elements and prevent collapsing of padding
|
||||
.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
|
||||
//
|
||||
// Sometimes you might have too many links in your fixed navbar and you need to
|
||||
|
Loading…
Reference in New Issue
Block a user