Skip to content

Commit 83e1c86

Browse files
committed
Merge pull request stylus#293 from naoak/stylus049
Bump stylus to 0.49 and pass tests
2 parents df9cf46 + 600cef5 commit 83e1c86

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "git://github.com/visionmedia/nib.git"
99
},
1010
"dependencies": {
11-
"stylus": "0.45.x"
11+
"stylus": "0.49.x"
1212
},
1313
"devDependencies": {
1414
"connect": "1.x",

test/cases/image.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#logo {
22
background-image: url("/images/branding/logo.main.png");
33
}
4-
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
4+
@media all and (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 1.5/1), (min-device-pixel-ratio: 1.5), (min-resolution: 138dpi), (min-resolution: 1.5dppx) {
55
#logo {
66
background-image: url("/images/branding/[email protected]");
77
background-size: auto auto;
@@ -10,7 +10,7 @@
1010
#logo {
1111
background-image: url("/images/branding/logo.main.png");
1212
}
13-
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
13+
@media all and (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 1.5/1), (min-device-pixel-ratio: 1.5), (min-resolution: 138dpi), (min-resolution: 1.5dppx) {
1414
#logo {
1515
background-image: url("/images/branding/[email protected]");
1616
background-size: 50px 100px;
@@ -19,7 +19,7 @@
1919
#logo {
2020
background-image: url("/images/branding/logo.main.png");
2121
}
22-
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
22+
@media all and (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 1.5/1), (min-device-pixel-ratio: 1.5), (min-resolution: 138dpi), (min-resolution: 1.5dppx) {
2323
#logo {
2424
background-image: url("/images/branding/[email protected]");
2525
background-size: cover;
@@ -28,7 +28,7 @@
2828
#logo {
2929
background-image: url("/images/branding/logo.main.png");
3030
}
31-
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
31+
@media all and (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 1.5/1), (min-device-pixel-ratio: 1.5), (min-resolution: 138dpi), (min-resolution: 1.5dppx) {
3232
#logo {
3333
background-image: url("/images/branding/[email protected]");
3434
background-size: contain;

test/cases/linear-gradient.css

+12-5
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,18 @@ body {
7676
background: linear-gradient(to left top, rgba(0,0,0,0.5) 80%, #000);
7777
}
7878
body {
79-
background: -webkit-linear-gradient(right bottom, hsla(0,0,0,0.5) 80.5%, #000);
80-
background: -moz-linear-gradient(right bottom, hsla(0,0,0,0.5) 80.5%, #000);
81-
background: -o-linear-gradient(right bottom, hsla(0,0,0,0.5) 80.5%, #000);
82-
background: -ms-linear-gradient(right bottom, hsla(0,0,0,0.5) 80.5%, #000);
83-
background: linear-gradient(to left top, hsla(0,0,0,0.5) 80.5%, #000);
79+
background: -webkit-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
80+
background: -moz-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
81+
background: -o-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
82+
background: -ms-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
83+
background: linear-gradient(to left top, hsla(0,0%,0%,0.5) 80.5%, #000);
84+
}
85+
body {
86+
background: -webkit-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
87+
background: -moz-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
88+
background: -o-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
89+
background: -ms-linear-gradient(right bottom, hsla(0,0%,0%,0.5) 80.5%, #000);
90+
background: linear-gradient(to left top, hsla(0,0%,0%,0.5) 80.5%, #000);
8491
}
8592
body {
8693
background: -webkit-linear-gradient(right bottom, #fff 20px, #000);

test/cases/linear-gradient.styl

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ body
3737
body
3838
background: linear-gradient(right bottom, 80.5% hsla(0,0,0,0.5), black)
3939

40+
body
41+
background: linear-gradient(right bottom, 80.5% hsla(0,0%,0%,0.5), black)
42+
4043
body
4144
background: linear-gradient(right bottom, 20px white, black)
4245

0 commit comments

Comments
 (0)