Skip to content

Commit fc349ef

Browse files
chriseppsteinchriseppstein
committed
Make core tests pass on sass 3.4.
1 parent 55831e4 commit fc349ef

File tree

11 files changed

+159
-36
lines changed

11 files changed

+159
-36
lines changed

‎core/stylesheets/compass/css3/_text-shadow.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// These defaults make the arguments optional for this mixin
77
// If you like, set different defaults in your project
88

9-
$default-text-shadow-color : #aaa !default;
9+
$default-text-shadow-color : #aaaaaa !default;
1010
$default-text-shadow-h-offset : 0px !default;
1111
$default-text-shadow-v-offset : 0px !default;
1212
$default-text-shadow-blur : 1px !default;

‎core/test/integrations/projects/compass/css/selection.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,37 @@
1313
color: #fff; }
1414

1515
.hot-pink-with-arguments::-moz-selection {
16-
color: white;
16+
color: #fff;
1717
background-color: #fe57a1; }
1818
.hot-pink-with-arguments::selection {
19-
color: white;
19+
color: #fff;
2020
background-color: #fe57a1; }
2121

2222
.hot-pink-with-arguments-and-extra-stuff::-moz-selection {
23-
color: white;
23+
color: #fff;
2424
background-color: #fe57a1;
2525
text-decoration: line-through; }
2626
.hot-pink-with-arguments-and-extra-stuff::selection {
27-
color: white;
27+
color: #fff;
2828
background-color: #fe57a1;
2929
text-decoration: line-through; }
3030

3131
.hot-pink-with-default-foreground::-moz-selection {
32-
color: black;
32+
color: #000;
3333
background-color: #fe57a1; }
3434
.hot-pink-with-default-foreground::selection {
35-
color: black;
35+
color: #000;
3636
background-color: #fe57a1; }
3737

3838
.browser-support-is-considered::-moz-selection {
39-
color: black;
39+
color: #000;
4040
background-color: #fe57a1;
4141
prefix: -moz;
4242
-moz-prefix: true;
4343
-ms-prefix: false;
4444
-webkit-prefix: false; }
4545
.browser-support-is-considered::selection {
46-
color: black;
46+
color: #000;
4747
background-color: #fe57a1;
4848
-moz-prefix: false;
4949
-ms-prefix: false;

‎core/test/integrations/projects/compass/css/selection.css.3.3‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
*::-moz-selection {
2+
background-color: #fe57a1;
3+
color: #fff; }
4+
*::selection {
5+
background-color: #fe57a1;
6+
color: #fff; }
7+
8+
.hot-pink::-moz-selection {
9+
background-color: #fe57a1;
10+
color: #fff; }
11+
.hot-pink::selection {
12+
background-color: #fe57a1;
13+
color: #fff; }
14+
15+
.hot-pink-with-arguments::-moz-selection {
16+
color: white;
17+
background-color: #fe57a1; }
18+
.hot-pink-with-arguments::selection {
19+
color: white;
20+
background-color: #fe57a1; }
21+
22+
.hot-pink-with-arguments-and-extra-stuff::-moz-selection {
23+
color: white;
24+
background-color: #fe57a1;
25+
text-decoration: line-through; }
26+
.hot-pink-with-arguments-and-extra-stuff::selection {
27+
color: white;
28+
background-color: #fe57a1;
29+
text-decoration: line-through; }
30+
31+
.hot-pink-with-default-foreground::-moz-selection {
32+
color: black;
33+
background-color: #fe57a1; }
34+
.hot-pink-with-default-foreground::selection {
35+
color: black;
36+
background-color: #fe57a1; }
37+
38+
.browser-support-is-considered::-moz-selection {
39+
color: black;
40+
background-color: #fe57a1;
41+
prefix: -moz;
42+
-moz-prefix: true;
43+
-ms-prefix: false;
44+
-webkit-prefix: false; }
45+
.browser-support-is-considered::selection {
46+
color: black;
47+
background-color: #fe57a1;
48+
-moz-prefix: false;
49+
-ms-prefix: false;
50+
-webkit-prefix: false; }

‎core/test/integrations/projects/compass/css/utilities.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
p.light {
2323
background-color: #f3aead;
24-
color: black; }
24+
color: #000; }
2525

2626
p.dark {
2727
background-color: #a22321;
28-
color: white; }
28+
color: #fff; }
2929

3030
p.light-with-args {
3131
background-color: #f3aead;

‎core/test/integrations/projects/compass/css/utilities.css.3.3‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
.clearfix {
2+
overflow: hidden;
3+
*zoom: 1; }
4+
5+
.pie-clearfix {
6+
*zoom: 1; }
7+
.pie-clearfix:after {
8+
content: "\0020";
9+
display: block;
10+
height: 0;
11+
clear: both;
12+
overflow: hidden;
13+
visibility: hidden; }
14+
15+
.simple-pie-clearfix {
16+
*zoom: 1; }
17+
.simple-pie-clearfix:after {
18+
content: "";
19+
display: table;
20+
clear: both; }
21+
22+
p.light {
23+
background-color: #f3aead;
24+
color: black; }
25+
26+
p.dark {
27+
background-color: #a22321;
28+
color: white; }
29+
30+
p.light-with-args {
31+
background-color: #f3aead;
32+
color: blue; }
33+
34+
p.dark-with-args {
35+
background-color: #a22321;
36+
color: yellow; }
37+
38+
th {
39+
background-color: white; }
40+
th.even, th:nth-child(2n) {
41+
background-color: yellow; }
42+
43+
tr.odd td, tr:nth-child(2n+1) td {
44+
background-color: white; }
45+
tr.odd td.even, tr.odd td:nth-child(2n), tr:nth-child(2n+1) td.even, tr:nth-child(2n+1) td:nth-child(2n) {
46+
background-color: yellow; }
47+
48+
tr.even td {
49+
background-color: red; }
50+
tr.even td.even, tr.even td:nth-child(2n) {
51+
background-color: red; }
52+
53+
tfoot th, tfoot td {
54+
background-color: white; }
55+
tfoot th.even, tfoot th:nth-child(2n), tfoot td.even, tfoot td:nth-child(2n) {
56+
background-color: yellow; }
57+
58+
p.ellipsis {
59+
white-space: nowrap;
60+
overflow: hidden;
61+
-ms-text-overflow: ellipsis;
62+
-o-text-overflow: ellipsis;
63+
text-overflow: ellipsis; }
64+
65+
p.ellipsis.moz {
66+
white-space: nowrap;
67+
overflow: hidden;
68+
-ms-text-overflow: ellipsis;
69+
-o-text-overflow: ellipsis;
70+
text-overflow: ellipsis;
71+
-moz-binding: url('/tmp/xml/ellipsis.xml#ellipsis'); }

‎core/test/integrations/projects/compass/sass/box_shadow.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@import "compass/css3/box-shadow";
44

55
.no-box-shadow { @include box-shadow(none); }
6-
.box-shadow { @include box-shadow(default, 2px 2px 5px #222);}
6+
.box-shadow { @include box-shadow(default, 2px 2px 5px #222222);}
77
.single-box-shadow { @include single-box-shadow;}
8-
.multiple-box-shadows { @include box-shadow(default, 2px 2px 5px #222);}
8+
.multiple-box-shadows { @include box-shadow(default, 2px 2px 5px #222222);}
99
.legacy-single-box-shadow { @include single-box-shadow(blue);}

‎core/test/integrations/projects/compass/sass/color.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
}
88

99
.contrasts-light {
10-
@include contrasted(#eee);
10+
@include contrasted(#eeeeee, $dark: black);
1111
}
1212

1313
.contrasts-dark {
14-
@include contrasted(#222);
14+
@include contrasted(#222222, $light: white);
1515
}
1616

1717
.contrasts-light-with-contrast-color-override {
18-
@include contrasted(#eee, $dark: red);
18+
@include contrasted(#eeeeee, $dark: red);
1919
}
2020

2121
.contrasts-dark-with-contrast-color-override {
22-
@include contrasted(#222, $light: yellow);
22+
@include contrasted(#222222, $light: yellow);
2323
}

‎core/test/integrations/projects/compass/sass/gradients.sass‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
$svg-gradient-shim-threshold: 0
55

66
.bg-shortcut-simple-image
7-
+background(#fff url('foo.png'))
7+
+background(white url('foo.png'))
88

99
.bg-shortcut-linear-gradient
10-
+background(#fff linear-gradient(top left, #ddd, #aaa))
10+
+background(white linear-gradient(top left, #ddd, #aaa))
1111

1212
.bg-linear-gradient-angle-svg
1313
+background-image(linear-gradient(-45deg, blue, black))
@@ -28,19 +28,19 @@ $svg-gradient-shim-threshold: 0
2828
+background-image(linear-gradient(left, #ddd 10px, #aaa 40px))
2929

3030
.transparent-in-linear-gradient
31-
+background-image(#fff linear-gradient(top left, transparent, #aaa))
31+
+background-image(white linear-gradient(top left, transparent, #aaa))
3232

3333
.currentColor-in-linear-gradient
34-
+background-image(#fff linear-gradient(top left, transparent, currentColor))
34+
+background-image(white linear-gradient(top left, transparent, currentColor))
3535

3636
.calc-in-linear-gradient
3737
+background-image(linear-gradient(to right, white calc(100% - 50px), transparent calc(100% - 50px)))
3838

3939
.rgba-in-linear-gradient
40-
+background-image(#fff linear-gradient(top left, rgba(255,255,255,0.8), rgba(0,0,0,0.1)))
40+
+background-image(white linear-gradient(top left, rgba(255,255,255,0.8), rgba(0,0,0,0.1)))
4141

4242
.bg-shortcut-radial-gradient
43-
+background(#fff radial-gradient(center center, #ddd, #aaa 100px))
43+
+background(white radial-gradient(center center, #ddd, #aaa 100px))
4444

4545
.bg-all-gradient-types-with-simplification
4646
+background-with-css2-fallback(image-url("4x6.png"), linear-gradient(top left, #ddd, #aaa), radial-gradient(center center, #ddd, #aaa 100px), #ffcc00)
@@ -91,7 +91,7 @@ $svg-gradient-shim-threshold: 10
9191
+background-image(radial-gradient(#ddd, #aaa 100px))
9292

9393
.image-fallback
94-
+background-image(image(radial-gradient(#ddd, #aaa 100px), image-url("4x6.png"), #c00))
94+
+background-image(image(radial-gradient(#ddd, #aaa 100px), image-url("4x6.png"), #cc0000))
9595

9696
.cross-fade
9797
+background-image(cross-fade(radial-gradient(#ddd, #aaa 100px), image-url("4x6.png")))
@@ -106,7 +106,7 @@ $svg-gradient-shim-threshold: 10
106106
+filter-gradient(white, black, vertical)
107107

108108
.ie-alpha-filter
109-
+filter-gradient(rgba(#fff, 1), rgba(#fff, 0))
109+
+filter-gradient(rgba(white, 1), rgba(white, 0))
110110

111111
.linear-gradient-new
112112
+background(linear-gradient(to bottom, #ff0000 0%, #88aa44 100%))

‎core/test/integrations/projects/compass/sass/text_shadow.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
.default-single-text-shadow { @include single-text-shadow;}
55
.none { @include single-text-shadow(none);}
6-
.color-only { @include single-text-shadow(#ccc);}
7-
.color-first-with-params { @include single-text-shadow(#ccc, 2px, 2px, 5px, 2px);}
8-
.color-last-with-params { @include single-text-shadow(2px, 2px, 5px, 2px, #ccc);}
6+
.color-only { @include single-text-shadow(#cccccc);}
7+
.color-first-with-params { @include single-text-shadow(#cccccc, 2px, 2px, 5px, 2px);}
8+
.color-last-with-params { @include single-text-shadow(2px, 2px, 5px, 2px, #cccccc);}
99
.default-text-shadow { @include text-shadow;}
10-
.multiple-text-shadows-with-default { @include text-shadow(default, 2px 2px 5px #222);}
11-
.multiple-text-shadows { @include text-shadow(4px 4px 10px #444, 2px 2px 5px #222);}
12-
.multiple-text-shadows-with-spread { @include text-shadow(4px 4px 10px 1px #444, 2px 2px 5px 3px #222);}
10+
.multiple-text-shadows-with-default { @include text-shadow(default, 2px 2px 5px #222222);}
11+
.multiple-text-shadows { @include text-shadow(4px 4px 10px #444444, 2px 2px 5px #222222);}
12+
.multiple-text-shadows-with-spread { @include text-shadow(4px 4px 10px 1px #444444, 2px 2px 5px 3px #222222);}

‎core/test/integrations/projects/compass/sass/vertical_rhythm.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $base-line-height: 16px;
6565
$base-font-size: 18px;
6666
$base-line-height: $base-font-size * 1.4;
6767
$rhythm-unit: em;
68-
$default-rhythm-border-style: solid #aaa;
68+
$default-rhythm-border-style: solid #aaaaaa;
6969

7070
@import "compass/typography/vertical_rhythm";
7171

@@ -118,7 +118,7 @@ blockquote {
118118
$base-font-size: 18px;
119119
$base-line-height: $base-font-size * 1.4;
120120
$rhythm-unit: rem;
121-
$default-rhythm-border-style: solid #aaa;
121+
$default-rhythm-border-style: solid #aaaaaa;
122122
@import "compass/typography/vertical_rhythm";
123123

124124
@include establish-baseline;
@@ -169,7 +169,7 @@ blockquote {
169169
$base-font-size: 18px;
170170
$base-line-height: $base-font-size * 1.4;
171171
$rhythm-unit: px;
172-
$default-rhythm-border-style: solid #aaa;
172+
$default-rhythm-border-style: solid #aaaaaa;
173173
@import "compass/typography/vertical_rhythm";
174174

175175
@include establish-baseline;

0 commit comments

Comments
 (0)