rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Fix media-breakpoint-between (#23997)

Browse Source 
* Fix media-breakpoint-between

When compiling .scss that uses media-breakpoint between with xs as the lower bound or xl as the upper bound, a compilation error can occur due to $min/$max being set to null, or the resulting .css can be invalid (see issue #23965).

(This is basically the same fix that was applied to media-breakpoint-only a short time ago).

* Update _breakpoints.scss

Make houndci-bot recommended changes.
This commit is contained in:
Trent Clowater 2017-10-02 23:38:59 -05:00 committed by Mark Otto
parent ac69547314
commit 7a7589ffc2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scss/mixins/_breakpoints.scss
View File

@ -81,9 +81,19 @@
$min: breakpoint-min($lower, $breakpoints); $min: breakpoint-min($lower, $breakpoints);
$max: breakpoint-max($upper, $breakpoints); $max: breakpoint-max($upper, $breakpoints);
@if $min != null and $max != null {
@media (min-width: $min) and (max-width: $max) { @media (min-width: $min) and (max-width: $max) {
@content; @content;
} }
} @else if $max == null {
@include media-breakpoint-up($lower) {
@content;
}
} @else if $min == null {
@include media-breakpoint-down($upper) {
@content;
}
}
} }
// Media between the breakpoint's minimum and maximum widths. // Media between the breakpoint's minimum and maximum widths.