Merge branch 'property-interp-fix-2' of https://github.com/seven-phases-max/less.js

Conflicts:
	lib/less/parser.js
This commit is contained in:
Luke Page
2014-02-01 18:33:58 +00:00
4 changed files with 53 additions and 19 deletions

View File

@@ -1,4 +1,4 @@
test {
pi-test {
border: 0;
ufo-width: 50%;
*-z-border: 1px dashed blue;
@@ -8,7 +8,13 @@ test {
border-top-red-radius-: 3pt;
global-local-mixer-property: strong;
}
test-merge {
pi-test-merge {
pre-property-ish: high, middle, low, base;
pre-property-ish+: nice try dude;
}
pi-indirect-vars {
auto: auto;
}
pi-complex-values {
3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */: none;
}

View File

@@ -1,5 +1,5 @@
test {
pi-test {
@prefix: ufo-;
@a: border;
@bb: top;
@@ -39,3 +39,15 @@ test {
pre-property-ish@{subterfuge}: nice try dude;
}
}
pi-indirect-vars {
@{p}: @p;
@p: @@a;
@a: b;
@b: auto;
}
pi-complex-values {
@{p}@{p}: none;
@p: (1 + 2px) fadeout(#ff0, 50%), pi() /* foo */;
}