github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-01-21 05:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2643 from SomMeri/shorthand-color-interpolated-into-selector-1481

Browse Source 
Keep shorthand color form the same way as named colors are kept.
This commit is contained in:
Luke Page
2015-09-09 13:03:03 +01:00
parent 3ef676ad41 30fe1cb9e2
commit 8a135bd89b
12 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/css/comments2.css
View File

@@ -2,7 +2,7 @@
/* Safari and Chrome */
}
.bg {
background-image: linear-gradient(#333333 /*{comment}*/, #111111);
background-image: linear-gradient(#333 /*{comment}*/, #111);
}
#planadvisor,
.first,

2
test/css/compression/compression.css
View File

@@ -1,3 +1,3 @@
#colours{color1:#fea;color2:#fea;color3:rgba(255,238,170,0.1);string:"#ffeeaa";/*! but not this type
#colours{color1:#fea;color2:#ffeeaa;color3:rgba(255,238,170,0.1);string:"#fea";/*! but not this type
Note preserved whitespace
*/}dimensions{val:.1px;val:0;val:4cm;val:.2;val:5;angles-must-have-unit:0deg;durations-must-have-unit:0s;length-doesnt-have-unit:0;width:auto\9}@page{marks:none;@top-left-corner{vertical-align:top}@top-left{vertical-align:top}}.shadow^.dom,body^^.shadow{display:done}

2
test/css/extract-and-length.css
View File

@@ -1,6 +1,6 @@
.multiunit {
length: 6;
extract: abc "abc" 1 1px 1% #112233;
extract: abc "abc" 1 1px 1% #123;
}
.incorrect-index {
v1: extract(a b c, 5);

6
test/css/functions.css
View File

@@ -4,7 +4,7 @@
height: undefined("self");
border-width: 5;
variable: 11;
background: linear-gradient(#000000, #ffffff);
background: linear-gradient(#000, #fff);
}
#built-in {
escaped: -Some::weird(#thing, y);
@@ -60,7 +60,7 @@
replace-single-quoted: 'foo-2';
replace-escaped-string: bar-2;
replace-keyword: baz-2;
replace-with-color: "#113355#1133557";
replace-with-color: "#135#1357";
replace-with-number: "2em07";
format: "rgb(32, 128, 64)";
format-string: "hello world";
@@ -68,7 +68,7 @@
format-url-encode: "red is %23ff0000";
format-single-quoted: 'hello single world';
format-escaped-string: hello escaped world;
format-color-as-string: "#112233";
format-color-as-string: "#123";
format-number-as-string: "4px";
eformat: rgb(32, 128, 64);
unitless: 12;

2
test/css/mixins-args.css
View File

@@ -34,7 +34,7 @@
}
body {
padding: 30px;
color: #ff0000;
color: #f00;
}
.scope-mix {
width: 8;

2
test/css/scope.css
View File

@@ -1,5 +1,5 @@
.tiny-scope {
color: #998899;
color: #989;
}
.scope1 {
color: blue;

2
test/css/strings.css
View File

@@ -28,7 +28,7 @@
#interpolation {
url: "http://lesscss.org/dev/image.jpg";
url2: "http://lesscss.org/image-256.jpg";
url3: "http://lesscss.org#445566";
url3: "http://lesscss.org#456";
url4: "http://lesscss.org/hello";
url5: "http://lesscss.org/54.4px";
}

2
test/css/url-args/urls.css
View File

@@ -5,7 +5,7 @@
#shorthands {
background: url("http://www.lesscss.org/spec.html?424242") no-repeat 0 4px;
background: url("img.jpg?424242") center / 100px;
background: #ffffff url(image.png?424242) center / 1px 100px repeat-x scroll content-box padding-box;
background: #fff url(image.png?424242) center / 1px 100px repeat-x scroll content-box padding-box;
}
#misc {
background-image: url(images/image.jpg?424242);

2
test/css/urls.css
View File

@@ -12,7 +12,7 @@
#shorthands {
background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
background: url("img.jpg") center / 100px;
background: #ffffff url(image.png) center / 1px 100px repeat-x scroll content-box padding-box;
background: #fff url(image.png) center / 1px 100px repeat-x scroll content-box padding-box;
}
#misc {
background-image: url(images/image.jpg);

10
test/css/variables.css
View File

@@ -3,7 +3,7 @@
}
.variables {
height: 24px;
color: #888888;
color: #888;
font-family: "Trebuchet MS", Verdana, sans-serif;
quotes: "~" "~";
}
@@ -16,10 +16,10 @@
.values {
minus-one: -1;
font-family: 'Trebuchet', 'Trebuchet', 'Trebuchet';
color: #888888 !important;
same-color: #888888 !important;
same-again: #888888 !important;
multi-important: #888888 #888888, 'Trebuchet' !important;
color: #888 !important;
same-color: #888 !important;
same-again: #888 !important;
multi-important: #888 #888, 'Trebuchet' !important;
multi: something 'A', B, C, 'Trebuchet';
}
.variable-names .quoted {