Handle complex expressions in add() & subtract() (#34047)

twbs · Jun 22, 2021 · fcedacf · fcedacf
1 parent 7e86c32
commit fcedacf
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/scss/_functions.scss b/scss/_functions.scss
@@ -120,6 +120,14 @@
     @return $value1 + $value2;
   }
 
+  @if type-of($value1) != number {
+    $value1: unquote("(") + $value1 + unquote(")");
+  }
+
+  @if type-of($value2) != number {
+    $value2: unquote("(") + $value2 + unquote(")");
+  }
+
   @return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote(" + ") + $value2);
 }
 
@@ -140,5 +148,13 @@
     @return $value1 - $value2;
   }
 
+  @if type-of($value1) != number {
+    $value1: unquote("(") + $value1 + unquote(")");
+  }
+
+  @if type-of($value2) != number {
+    $value2: unquote("(") + $value2 + unquote(")");
+  }
+
   @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
 }