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

Fix #9174: pad bottom of navbar collapsed content and clear floated contents

Browse Source
This commit is contained in:
Mark Otto 2013-08-06 16:39:18 -07:00
parent 6da346527b
commit 223e032150
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dist/css/bootstrap.css vendored
View File

@ -2869,6 +2869,30 @@ button.close {
margin-bottom: 0; margin-bottom: 0;
} }
.nav-collapse {
padding-bottom: 15px;
}
.nav-collapse:before,
.nav-collapse:after {
display: table;
content: " ";
}
.nav-collapse:after {
clear: both;
}
.nav-collapse:before,
.nav-collapse:after {
display: table;
content: " ";
}
.nav-collapse:after {
clear: both;
}
@media (max-width: 768px) { @media (max-width: 768px) {
.nav-collapse-scrollable { .nav-collapse-scrollable {
max-height: 360px; max-height: 360px;
@ -3103,6 +3127,7 @@ button.close {
.nav-collapse.collapse { .nav-collapse.collapse {
display: block !important; display: block !important;
height: auto !important; height: auto !important;
padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
} }
} }

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

File diff suppressed because one or more lines are too long

9
less/navbar.less
View File

@ -82,14 +82,18 @@
} }
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;
.nav-collapse {
}
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
bottom: 0; bottom: 0;
margin-bottom: 0; // override .navbar defaults margin-bottom: 0; // override .navbar defaults
} }
.nav-collapse {
// Space out collapsed contents within the mobile navbar
padding-bottom: @navbar-padding-vertical;
// Clear floated elements and prevent collapsing of padding
.clearfix();
}
// Scrollable navbar navigation // Scrollable navbar navigation
// //
@ -353,6 +357,7 @@
.nav-collapse.collapse { .nav-collapse.collapse {
display: block !important; display: block !important;
height: auto !important; height: auto !important;
padding-bottom: 0; // Override default setting
overflow: visible !important; overflow: visible !important;
} }