don't floor in fixColor, better error msg for mix

leafo · leafo · commit 39603eeaf029 · 2012-02-25T11:25:51.000-08:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -1615,7 +1615,7 @@ function lib_percentage($number) {
 	// mix(@color1, @color2, @weight);
 	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
 	function lib_mix($args) {
-		if ($args[0] != "list")
+		if ($args[0] != "list" || count($args[2]) < 3)
 			$this->throwError("mix expects (color1, color2, weight)");
 
 		list($first, $second, $weight) = $args[2];
@@ -1940,7 +1940,6 @@ function fixColor($c) {
 		foreach (range(1, 3) as $i) {
 			if ($c[$i] < 0) $c[$i] = 0;
 			if ($c[$i] > 255) $c[$i] = 255;
-			$c[$i] = floor($c[$i]);
 		}
 
 		return $c;
diff --git a/tests/inputs/colors.less b/tests/inputs/colors.less
@@ -113,3 +113,10 @@ pre {
 	@errorBackground: #f2dede;
 	spin: spin(@errorBackground, -10);
 }
+
+dd {
+	@white: #fff;
+	background-color: mix(@white, darken(@white, 10%), 60%);
+}
+
+
diff --git a/tests/outputs/colors.css b/tests/outputs/colors.css
@@ -53,7 +53,7 @@ fade {
   f:rgba(255,255,255,0.2);
   f:rgba(34,23,64,0.5);
 }
-.mix { color:#7f7f7f; }
+.mix { color:#808080; }
 .percent { per:50%; }
 .colorz {
   color:#ebebeb;
@@ -65,4 +65,5 @@ body {
   chained:#fbeed5;
   direct:#fbefd5;
 }
-pre { spin:#f2dee1; }
+pre { spin:#f2dee1; }
+dd { background-color:#f5f5f5; }
