diff options
| author | Mark Otto <[email protected]> | 2014-03-09 20:45:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-09 20:45:32 -0700 |
| commit | b4d66b7f6b8ca49fbf45fccf445910d607969946 (patch) | |
| tree | 4cddf12596b35d2551466c63db3716886e315fe5 /less | |
| parent | 1a5fb4ef24f6d1beb71df946fa4781df10eab6e1 (diff) | |
| download | bootstrap-b4d66b7f6b8ca49fbf45fccf445910d607969946.tar.xz bootstrap-b4d66b7f6b8ca49fbf45fccf445910d607969946.zip | |
Fixes #12738
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 12 | ||||
| -rw-r--r-- | less/variables.less | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/less/navbar.less b/less/navbar.less index 34897e225..6ddf26356 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -48,7 +48,6 @@ // content for the user's viewport. .navbar-collapse { - max-height: @navbar-collapse-max-height; overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; @@ -88,6 +87,17 @@ } } +.navbar-fixed-top, +.navbar-fixed-bottom { + .navbar-collapse { + max-height: @navbar-collapse-max-height; + + @media (max-width: @screen-phone) and (orientation: landscape) { + max-height: 200px; + } + } +} + // Both navbar header and collapse // diff --git a/less/variables.less b/less/variables.less index 23577e5f9..82616ac56 100644 --- a/less/variables.less +++ b/less/variables.less @@ -261,7 +261,7 @@ //## Define the breakpoints at which your layout will change, adapting to different screen sizes. // Extra small screen / phone -// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1, and @screen-xs-min as of v3.2.0 +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; @screen-xs-min: @screen-xs; @screen-phone: @screen-xs-min; |