From: Trent Clowater <trentclowater@gmail.com>
Date: Tue, 3 Oct 2017 04:38:59 +0000 (-0500)
Subject: Fix media-breakpoint-between (#23997)
X-Git-Tag: v4.0.0-beta.2~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7589ffc2786910b3bc7260467227f7d10a462a;p=thirdparty%2Fbootstrap.git

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.
---

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;
+    }
   }
 }