kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

fixes #9475

Browse source
This commit is contained in:
Mark Otto 2013-08-16 15:07:45 -07:00
parent 60d150dfd7
commit f459d76e38
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dist/css/bootstrap.css vendored
View file

@ -3231,7 +3231,6 @@ button.close {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
overflow-x: visible; overflow-x: visible;
overflow-y: auto;
border-top: 1px solid #e6e6e6; border-top: 1px solid #e6e6e6;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@ -3257,6 +3256,10 @@ button.close {
clear: both; clear: both;
} }
.navbar-collapse.in {
overflow-y: auto;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-collapse { .navbar-collapse {
width: auto; width: auto;

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

File diff suppressed because one or more lines are too long

13
less/navbar.less
View file

@ -51,20 +51,19 @@
// content for the user's viewport. // content for the user's viewport.
.navbar-collapse { .navbar-collapse {
max-height: 340px;
overflow-x: visible;
padding-right: @navbar-padding-horizontal; padding-right: @navbar-padding-horizontal;
padding-left: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal;
border-top: 1px solid darken(@navbar-bg, 7%); border-top: 1px solid darken(@navbar-bg, 7%);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
// Clear floated elements and prevent collapsing of padding
.clearfix(); .clearfix();
// This is not automatically added to the `.navbar-fixed-top` because it causes
// z-index bugs in iOS7 (possibly earlier).
max-height: 340px;
overflow-x: visible;
overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
&.in {
overflow-y: auto;
}
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
width: auto; width: auto;
padding-right: 0; padding-right: 0;