Skip to content

Commit

Permalink
fixes #9439: use overflow: auto on navbar collapse
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Aug 13, 2013
1 parent fa330f3 commit 5b4fe08
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions dist/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -3154,10 +3154,10 @@ button.close {
}

.navbar-collapse {
max-height: 360px;
max-height: 340px;
padding: 5px 15px;
overflow-x: visible;
overflow-y: scroll;
overflow-y: auto;
border-top: 1px solid #e6e6e6;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-webkit-overflow-scrolling: touch;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions less/navbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@

// This is not automatically added to the `.navbar-fixed-top` because it causes
// z-index bugs in iOS7 (possibly earlier).
max-height: 360px;
max-height: 340px;
overflow-x: visible;
overflow-y: scroll;
overflow-y: auto;
-webkit-overflow-scrolling: touch;

@media (min-width: @grid-float-breakpoint) {
Expand Down

0 comments on commit 5b4fe08

Please sign in to comment.