Merge pull request #2934 from nschonni/fix(mix)--Align-argurment-names-to-color1/color2

mgreter · web-flow · commit c81a8e503cd5 · 2019-07-15T21:23:34.000+02:00
fix(mix): Align argurment names to color1/color2
diff --git a/src/fn_colors.cpp b/src/fn_colors.cpp
@@ -163,11 +163,11 @@ namespace Sass {
                              c1->a()*p + c2->a()*(1-p));
     }
 
-    Signature mix_sig = "mix($color-1, $color-2, $weight: 50%)";
+    Signature mix_sig = "mix($color1, $color2, $weight: 50%)";
     BUILT_IN(mix)
     {
-      Color_Obj  color1 = ARG("$color-1", Color);
-      Color_Obj  color2 = ARG("$color-2", Color);
+      Color_Obj  color1 = ARG("$color1", Color);
+      Color_Obj  color2 = ARG("$color2", Color);
       double weight = DARG_U_PRCT("$weight");
       return colormix(ctx, pstate, color1, color2, weight);
 

Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,11 @@ namespace Sass {`
`163`	`163`	`c1->a()p + c2->a()(1-p));`
`164`	`164`	`}`
`165`	`165`
`166`		`- Signature mix_sig = "mix($color-1, $color-2, $weight: 50%)";`
	`166`	`+ Signature mix_sig = "mix($color1, $color2, $weight: 50%)";`
`167`	`167`	`BUILT_IN(mix)`
`168`	`168`	`{`
`169`		`- Color_Obj color1 = ARG("$color-1", Color);`
`170`		`- Color_Obj color2 = ARG("$color-2", Color);`
	`169`	`+ Color_Obj color1 = ARG("$color1", Color);`
	`170`	`+ Color_Obj color2 = ARG("$color2", Color);`
`171`	`171`	`double weight = DARG_U_PRCT("$weight");`
`172`	`172`	`return colormix(ctx, pstate, color1, color2, weight);`
`173`	`173`