Commit b4d66b7f authored by Mark Otto's avatar Mark Otto

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"
parent 1a5fb4ef
...@@ -4649,7 +4649,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4649,7 +4649,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.navbar-collapse { .navbar-collapse {
max-height: 340px;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
overflow-x: visible; overflow-x: visible;
...@@ -4690,6 +4689,18 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4690,6 +4689,18 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
} }
.navbar-fixed-top .navbar-collapse,
.navbar-fixed-bottom .navbar-collapse {
max-height: 340px;
}
@media (max-width: 480px) and (orientation: landscape) {
.navbar-fixed-top .navbar-collapse,
.navbar-fixed-bottom .navbar-collapse {
max-height: 200px;
}
}
.container > .navbar-header, .container > .navbar-header,
.container-fluid > .navbar-header, .container-fluid > .navbar-header,
.container > .navbar-collapse, .container > .navbar-collapse,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3705,7 +3705,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -3705,7 +3705,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
} }
.navbar-collapse { .navbar-collapse {
max-height: 340px;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
overflow-x: visible; overflow-x: visible;
...@@ -3740,6 +3739,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -3740,6 +3739,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
padding-left: 0; padding-left: 0;
} }
} }
.navbar-fixed-top .navbar-collapse,
.navbar-fixed-bottom .navbar-collapse {
max-height: 340px;
}
@media (max-width: 480px) and (orientation: landscape) {
.navbar-fixed-top .navbar-collapse,
.navbar-fixed-bottom .navbar-collapse {
max-height: 200px;
}
}
.container > .navbar-header, .container > .navbar-header,
.container-fluid > .navbar-header, .container-fluid > .navbar-header,
.container > .navbar-collapse, .container > .navbar-collapse,
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
// content for the user's viewport. // content for the user's viewport.
.navbar-collapse { .navbar-collapse {
max-height: @navbar-collapse-max-height;
overflow-x: visible; overflow-x: visible;
padding-right: @navbar-padding-horizontal; padding-right: @navbar-padding-horizontal;
padding-left: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal;
...@@ -88,6 +87,17 @@ ...@@ -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 // Both navbar header and collapse
// //
......
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
//## Define the breakpoints at which your layout will change, adapting to different screen sizes. //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
// Extra small screen / phone // 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: 480px;
@screen-xs-min: @screen-xs; @screen-xs-min: @screen-xs;
@screen-phone: @screen-xs-min; @screen-phone: @screen-xs-min;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment