diff options
| author | Mark Otto <[email protected]> | 2013-08-16 15:07:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-16 15:07:45 -0700 |
| commit | f459d76e388b1d73b8b0065f8fbaf573f7eaed32 (patch) | |
| tree | bc7f63a0de41e4e7d6bf7f8a6db7eac4388d8e6c /less | |
| parent | 60d150dfd7da5bdebf117bfe4c9010085823cf17 (diff) | |
| download | bootstrap-f459d76e388b1d73b8b0065f8fbaf573f7eaed32.tar.xz bootstrap-f459d76e388b1d73b8b0065f8fbaf573f7eaed32.zip | |
fixes #9475
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/less/navbar.less b/less/navbar.less index f970d8ef9..b5320ba4e 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -51,20 +51,19 @@ // content for the user's viewport. .navbar-collapse { + max-height: 340px; + overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; border-top: 1px solid darken(@navbar-bg, 7%); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); - // Clear floated elements and prevent collapsing of padding .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; + &.in { + overflow-y: auto; + } + @media (min-width: @grid-float-breakpoint) { width: auto; padding-right: 0; |