Merge https://github.com/less/less.js into nested-parent-selector-2026-v1

Conflicts:
	lib/less/parser/parser.js
	lib/less/tree/ruleset.js
This commit is contained in:
jurcovicovam
2015-01-28 10:46:49 +01:00
85 changed files with 1386 additions and 846 deletions

View File

@@ -80,3 +80,4 @@
#output-block {
comment: /* // Not commented out // */;
}
/*comment on last line*/

View File

@@ -127,6 +127,7 @@
mixt: rgba(255, 0, 0, 0.5);
}
#built-in .is-a {
ruleset: true;
color: true;
color1: true;
color2: true;

View File

@@ -34,6 +34,14 @@ div#id.class[a=1][b=2].class:not(1) {
.visible + .visible .sub {
color: green;
}
@supports (something: else) {
.class {
something: else;
}
.nestedToo .class {
something: else;
}
}
.b {
color: red;
color: green;
@@ -66,3 +74,20 @@ div#id.class[a=1][b=2].class:not(1) {
color: red;
}
}
.test {
color: red;
}
.test:first-child {
color: blue;
}
@keyframes some-name {
property: value;
}
@supports (animation-name: test) {
@keyframes some-name {
property: value;
}
.selector {
color: red;
}
}

View File

@@ -43,3 +43,9 @@
.class .inner {
test: 9;
}
.when-calling-nested-issue-2394 {
width: auto !important;
}
.when-calling-nested-with-param-issue-2394 {
width: 10px !important;
}

View File

@@ -119,7 +119,7 @@ p a span {
.bloodred {
color: green;
}
#blood.blood.red.black {
#blood.blood.red.black:blood {
color: black;
}
:nth-child(3) {

View File

@@ -57,6 +57,7 @@
}
#data-uri {
uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
background-image: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg=="), url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
uri-fragment: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==#fragment");
}
#data-uri-guess {