Permalink
Browse files

Merge branch 'bug/coercion'

  • Loading branch information...
tj committed Dec 7, 2011
2 parents b29396a + a819d85 commit 8b87161c19efa0e907891f4d84e94ea0d1f2e966
Showing with 22 additions and 1 deletion.
  1. +1 −1 lib/nodes/unit.js
  2. +9 −0 test/cases/regression.480.css
  3. +12 −0 test/cases/regression.480.styl
View
@@ -83,7 +83,7 @@ Unit.prototype.clone = function(){
*/
Unit.prototype.operate = function(op, right){
- var type = this.type || right.type;
+ var type = this.type || right.first.type;
// swap color
if ('rgba' == right.nodeName || 'hsla' == right.nodeName) {
@@ -0,0 +1,9 @@
+body {
+ foo: 25px;
+ foo: 25px;
+}
+body {
+ foo: 10em;
+ foo: 10em;
+ foo: 10px;
+}
@@ -0,0 +1,12 @@
+n = 5px
+
+body
+ foo: n * 5
+ foo: 5 * n
+
+n = 5em 5px 5
+
+body
+ foo: n * 2
+ foo: 2 * n
+ foo: 2px * n

0 comments on commit 8b87161

Please sign in to comment.