Fixes leafo#559 - mix() fix

robocoder · robocoder · commit 9410cbb398d1 · 2018-02-28T23:06:40.000-05:00
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -4526,7 +4526,7 @@ protected function libMix($args)
         ];
 
         if ($firstAlpha != 1.0 || $secondAlpha != 1.0) {
-            $new[] = $firstAlpha * $weight + $secondAlpha * ($weight - 1);
+            $new[] = $firstAlpha * $weight + $secondAlpha * (1 - $weight);
         }
 
         return $this->fixColor($new);
diff --git a/tests/inputs/functions.scss b/tests/inputs/functions.scss
@@ -165,4 +165,11 @@ $str: 'global';
 div {
   margin: mapping(one two);
   @include test();
-}
+}
+
+$a: rgba(#000, 0.5);
+$b: rgba(#fff, 0.75);
+
+.test {
+    color: mix($a, $b);
+}
diff --git a/tests/outputs/functions.css b/tests/outputs/functions.css
@@ -49,3 +49,6 @@ p {
 div {
   margin: 1px 1px 2px 2px;
   padding: 1px 1px 2px 2px; }
+
+.test {
+  color: rgba(159, 159, 159, 0.625); }
diff --git a/tests/outputs_numbered/functions.css b/tests/outputs_numbered/functions.css
@@ -51,3 +51,6 @@ p {
 div {
   margin: 1px 1px 2px 2px;
   padding: 1px 1px 2px 2px; }
+/* line 173, inputs/functions.scss */
+.test {
+  color: rgba(159, 159, 159, 0.625); }

Original file line number	Diff line number	Diff line change
`@@ -4526,7 +4526,7 @@ protected function libMix($args)`
`4526`	`4526`	`];`
`4527`	`4527`
`4528`	`4528`	`if ($firstAlpha != 1.0 \|\| $secondAlpha != 1.0) {`
`4529`		`- $new[] = $firstAlpha * $weight + $secondAlpha * ($weight - 1);`
	`4529`	`+ $new[] = $firstAlpha * $weight + $secondAlpha * (1 - $weight);`
`4530`	`4530`	`}`
`4531`	`4531`
`4532`	`4532`	`return $this->fixColor($new);`