]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fix breakpoint mixins for custom breakpoint maps (#25264)
authorSander Melnikov <sandydoo@users.noreply.github.com>
Sat, 13 Jan 2018 07:45:21 +0000 (10:45 +0300)
committerXhmikosR <xhmikosr@gmail.com>
Sat, 13 Jan 2018 07:45:21 +0000 (09:45 +0200)
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

index 85ce72f6b618d3e25d2a5e18ea10af8320643520..d1ad684cc76e58d07333a38e0d6e0451b8f47de8 100644 (file)
       @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;
     }
   }
       @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;
     }
   }