From 216c7ea20f9a96ece061fe2391b8a5d7740153c0 Mon Sep 17 00:00:00 2001 From: Sander Melnikov Date: Sat, 13 Jan 2018 10:45:21 +0300 Subject: [PATCH] Fix breakpoint mixins for custom breakpoint maps (#25264) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using the `media-breakpoint-between` or `media-breakpoint-only` mixins with a custom breakpoint map – not defined as `$grid-breakpoints` – the mixin incorrectly defaults back to the global `$grid-breakpoints` map in certain situations. This commit correctly passes on the `$breakpoints` argument to the other mixins called within the block. --- scss/mixins/_breakpoints.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index 85ce72f6b6..d1ad684cc7 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -90,11 +90,11 @@ @content; } } @else if $max == null { - @include media-breakpoint-up($lower) { + @include media-breakpoint-up($lower, $breakpoints) { @content; } } @else if $min == null { - @include media-breakpoint-down($upper) { + @include media-breakpoint-down($upper, $breakpoints) { @content; } } @@ -112,11 +112,11 @@ @content; } } @else if $max == null { - @include media-breakpoint-up($name) { + @include media-breakpoint-up($name, $breakpoints) { @content; } } @else if $min == null { - @include media-breakpoint-down($name) { + @include media-breakpoint-down($name, $breakpoints) { @content; } }