From 7a7589ffc2786910b3bc7260467227f7d10a462a Mon Sep 17 00:00:00 2001 From: Trent Clowater Date: Mon, 2 Oct 2017 23:38:59 -0500 Subject: [PATCH] Fix media-breakpoint-between (#23997) * 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. --- scss/mixins/_breakpoints.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index 082c5f99b5..a9866bd907 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -81,8 +81,18 @@ $min: breakpoint-min($lower, $breakpoints); $max: breakpoint-max($upper, $breakpoints); - @media (min-width: $min) and (max-width: $max) { - @content; + @if $min != null and $max != null { + @media (min-width: $min) and (max-width: $max) { + @content; + } + } @else if $max == null { + @include media-breakpoint-up($lower) { + @content; + } + } @else if $min == null { + @include media-breakpoint-down($upper) { + @content; + } } }