aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-02-07 02:53:35 -0800
committerChris Rebert <[email protected]>2016-02-07 02:53:37 -0800
commit35617a4b22f2eeb0a548cf6c0f76e73ce8a4b421 (patch)
treef127fe90238aa8041e3b8fbd1c5b7a4581d2cea6
parent6dee16ca90982b888fadd8070a0951b262612e3c (diff)
downloadbootstrap-35617a4b22f2eeb0a548cf6c0f76e73ce8a4b421.tar.xz
bootstrap-35617a4b22f2eeb0a548cf6c0f76e73ce8a4b421.zip
Assert that $grid-breakpoints and $container-max-widths are in ascending order; fixes #18549
[skip sauce]
-rw-r--r--scss/_variables.scss14
1 files changed, 14 insertions, 0 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index a375e9962..6cf0c6338 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -17,6 +17,18 @@
// Fonts
// Components
+@mixin _assert-ascending($map, $map-name) {
+ $prev-key: null;
+ $prev-num: null;
+ @each $key, $num in $map {
+ @if $prev-num != null and $prev-num >= $num {
+ @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+ }
+ $prev-key: $key;
+ $prev-num: $num;
+ }
+}
+
// General variable structure
//
// Variable format should follow the `$component-modifier-state-property` order.
@@ -112,6 +124,7 @@ $grid-breakpoints: (
lg: 992px,
xl: 1200px
) !default;
+@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
// Grid containers
@@ -124,6 +137,7 @@ $container-max-widths: (
lg: 940px,
xl: 1140px
) !default;
+@include _assert-ascending($container-max-widths, "$container-max-widths");
// Grid columns