From: Chris Rebert <cvrebert@google.com>
Date: Mon, 20 Jun 2016 05:23:16 +0000 (-0700)
Subject: Add comparability guard to _assert-ascending(); fixes #20123 (#20142)
X-Git-Tag: v4.0.0-alpha.3~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b17008c771b97e4fc55c6cc340309291c9b933cc;p=thirdparty%2Fbootstrap.git

Add comparability guard to _assert-ascending(); fixes #20123 (#20142)

[skip sauce]
[skip validator]
---

diff --git a/scss/_variables.scss b/scss/_variables.scss
index d129f9fee4..8a3df44be9 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;