aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Melnikov <[email protected]>2018-01-13 10:45:21 +0300
committerXhmikosR <[email protected]>2018-01-13 09:45:21 +0200
commit216c7ea20f9a96ece061fe2391b8a5d7740153c0 (patch)
treecb90c53a60ec2b0f4c76d509104a4a4bbafddb32
parentf4bf0542d78018a31c0ae07d5dee1aacfd20182e (diff)
downloadbootstrap-216c7ea20f9a96ece061fe2391b8a5d7740153c0.tar.xz
bootstrap-216c7ea20f9a96ece061fe2391b8a5d7740153c0.zip
Fix breakpoint mixins for custom breakpoint maps (#25264)
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.
-rw-r--r--scss/mixins/_breakpoints.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss
index 85ce72f6b..d1ad684cc 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;
}
}