]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Handle complex expressions in add() & subtract() (#34047)
authorGaël Poupard <ffoodd@users.noreply.github.com>
Tue, 25 May 2021 05:23:41 +0000 (07:23 +0200)
committerXhmikosR <xhmikosr@gmail.com>
Wed, 21 Jul 2021 13:20:01 +0000 (16:20 +0300)
scss/_functions.scss

index 9c06603150ed3fec95a30d800921923d40f9fa59..8abc31164e9817c05a632557f1e4fda8bdf4c3a8 100644 (file)
     @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);
 }
 
     @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);
 }