aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-06-19 22:23:16 -0700
committerGitHub <[email protected]>2016-06-19 22:23:16 -0700
commitb17008c771b97e4fc55c6cc340309291c9b933cc (patch)
tree99824a487e9665d8c0ac21068ce74386434cc618
parent143eca3ba97881f818a45a63b4bde7bfc3ed27f3 (diff)
downloadbootstrap-b17008c771b97e4fc55c6cc340309291c9b933cc.tar.xz
bootstrap-b17008c771b97e4fc55c6cc340309291c9b933cc.zip
Add comparability guard to _assert-ascending(); fixes #20123 (#20142)
[skip sauce] [skip validator]
-rw-r--r--scss/_variables.scss6
1 files changed, 5 insertions, 1 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d129f9fee..8a3df44be 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -21,7 +21,11 @@
$prev-key: null;
$prev-num: null;
@each $key, $num in $map {
- @if $prev-num != null and $prev-num >= $num {
+ @if $prev-num == null {
+ // Do nothing
+ } @else if not comparable($prev-num, $num) {
+ @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+ } @else if $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;