compass 0.11.2 → 0.11.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/features/command_line.feature +22 -1
- data/features/step_definitions/command_line_steps.rb +21 -1
- data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss +1 -0
- data/frameworks/compass/stylesheets/compass/css3/_box.scss +9 -9
- data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +4 -14
- data/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss +14 -1
- data/lib/compass.rbc +87 -11
- data/lib/compass/actions.rb +21 -9
- data/lib/compass/actions.rbc +453 -210
- data/lib/compass/commands.rb +1 -1
- data/lib/compass/commands/clean_project.rb +79 -0
- data/lib/compass/commands/registry.rb +3 -1
- data/lib/compass/commands/sprite.rb +1 -1
- data/lib/compass/commands/update_project.rb +5 -6
- data/lib/compass/commands/watch_project.rb +1 -1
- data/lib/compass/compiler.rb +12 -9
- data/lib/compass/compiler.rbc +386 -294
- data/lib/compass/configuration/adapters.rb +2 -2
- data/lib/compass/configuration/adapters.rbc +4 -4
- data/lib/compass/configuration/data.rb +4 -2
- data/lib/compass/exec/sub_command_ui.rb +1 -1
- data/lib/compass/sass_extensions.rbc +117 -19
- data/lib/compass/sass_extensions/functions/gradient_support.rbc +489 -453
- data/lib/compass/sass_extensions/functions/sprites.rb +4 -4
- data/lib/compass/sass_extensions/functions/sprites.rbc +588 -309
- data/lib/compass/sass_extensions/functions/urls.rb +18 -3
- data/lib/compass/sass_extensions/sprites.rb +9 -7
- data/lib/compass/sass_extensions/sprites.rbc +48 -64
- data/lib/compass/sass_extensions/sprites/engines.rb +24 -0
- data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb +13 -7
- data/lib/compass/sass_extensions/sprites/image_methods.rb +32 -0
- data/lib/compass/sass_extensions/sprites/sprite_map.rb +54 -142
- data/lib/compass/sass_extensions/sprites/sprite_map.rbc +3839 -1536
- data/lib/compass/sass_extensions/sprites/{base.rb → sprite_methods.rb} +21 -101
- data/lib/compass/sprite_importer.rb +202 -0
- data/lib/compass/sprite_importer.rbc +3943 -0
- data/lib/compass/validator.rb +11 -4
- data/lib/compass/version.rbc +67 -109
- data/test/fixtures/sprites/public/images/bad_extensions/ten-by-ten.gif +0 -0
- data/test/fixtures/sprites/public/images/bad_extensions/twenty-by-twenty.jpg +0 -0
- data/test/fixtures/stylesheets/busted_image_urls/config.rb +29 -0
- data/test/fixtures/stylesheets/busted_image_urls/css/screen.css +9 -0
- data/test/fixtures/stylesheets/busted_image_urls/images/feed.png +0 -0
- data/test/fixtures/stylesheets/busted_image_urls/images/flags/dk.png +0 -0
- data/test/fixtures/stylesheets/busted_image_urls/images/grid.png +0 -0
- data/test/fixtures/stylesheets/busted_image_urls/sass/screen.sass +14 -0
- data/test/fixtures/stylesheets/busted_image_urls/tmp/screen.css +9 -0
- data/test/fixtures/stylesheets/compass/css/box.css +19 -0
- data/test/fixtures/stylesheets/compass/css/legacy_clearfix.css +9 -0
- data/test/fixtures/stylesheets/compass/css/sprites.css +1 -1
- data/test/fixtures/stylesheets/compass/css/utilities.css +7 -0
- data/test/fixtures/stylesheets/compass/images/{flag-03c3b29b35.png → flag-s03c3b29b35.png} +0 -0
- data/test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss +3 -0
- data/test/fixtures/stylesheets/compass/sass/utilities.scss +4 -1
- data/test/fixtures/stylesheets/error/config.rb +10 -0
- data/test/fixtures/stylesheets/error/sass/screen.sass +2 -0
- data/test/integrations/compass_test.rb +22 -9
- data/test/integrations/sprites_test.rb +45 -45
- data/test/units/actions_test.rb +24 -0
- data/test/units/sprites/engine_test.rb +43 -0
- data/test/units/sprites/image_test.rb +2 -2
- data/test/units/sprites/importer_test.rb +66 -0
- data/test/units/sprites/sprite_command_test.rb +60 -0
- data/test/units/sprites/{base_test.rb → sprite_map_test.rb} +5 -5
- metadata +43 -34
- data/lib/compass/sass_extensions/sprites/sprites.rb +0 -62
data/lib/compass/validator.rb
CHANGED
@@ -1,9 +1,16 @@
|
|
1
1
|
begin
|
2
2
|
require 'rubygems'
|
3
3
|
require 'compass-validator'
|
4
|
-
rescue LoadError
|
5
|
-
|
6
|
-
|
4
|
+
rescue LoadError => e
|
5
|
+
if e.message =~ /core_ext/
|
6
|
+
raise Compass::MissingDependency, <<-ERRORMSG
|
7
|
+
The Compass CSS Validator is out of date. Please upgrade it:
|
8
|
+
sudo gem install compass-validator --version ">= 3.0.1"
|
9
|
+
ERRORMSG
|
10
|
+
else
|
11
|
+
raise Compass::MissingDependency, <<-ERRORMSG
|
12
|
+
The Compass CSS Validator could not be loaded. Please install it:
|
7
13
|
sudo gem install compass-validator
|
8
|
-
|
14
|
+
ERRORMSG
|
15
|
+
end
|
9
16
|
end
|
data/lib/compass/version.rbc
CHANGED
@@ -894,7 +894,7 @@ x
|
|
894
894
|
17
|
895
895
|
revision_from_git
|
896
896
|
i
|
897
|
-
|
897
|
+
36
|
898
898
|
45
|
899
899
|
0
|
900
900
|
1
|
@@ -910,99 +910,38 @@ i
|
|
910
910
|
4
|
911
911
|
1
|
912
912
|
9
|
913
|
-
|
913
|
+
34
|
914
914
|
45
|
915
|
-
0
|
916
915
|
5
|
916
|
+
6
|
917
917
|
5
|
918
918
|
7
|
919
|
-
|
919
|
+
7
|
920
920
|
64
|
921
921
|
47
|
922
922
|
49
|
923
923
|
3
|
924
924
|
1
|
925
|
-
49
|
926
|
-
6
|
927
|
-
1
|
928
|
-
49
|
929
|
-
7
|
930
|
-
0
|
931
|
-
19
|
932
|
-
0
|
933
|
-
15
|
934
|
-
20
|
935
|
-
0
|
936
|
-
7
|
937
|
-
8
|
938
|
-
13
|
939
|
-
70
|
940
|
-
9
|
941
925
|
56
|
942
|
-
15
|
943
|
-
44
|
944
|
-
43
|
945
|
-
9
|
946
|
-
7
|
947
|
-
10
|
948
|
-
78
|
949
|
-
49
|
950
|
-
11
|
951
|
-
2
|
952
|
-
6
|
953
926
|
8
|
954
|
-
|
955
|
-
12
|
956
|
-
1
|
927
|
+
50
|
957
928
|
9
|
958
|
-
92
|
959
|
-
45
|
960
|
-
0
|
961
|
-
13
|
962
|
-
5
|
963
|
-
7
|
964
|
-
14
|
965
|
-
4
|
966
|
-
5
|
967
|
-
78
|
968
|
-
98
|
969
|
-
15
|
970
|
-
2
|
971
|
-
47
|
972
|
-
101
|
973
|
-
16
|
974
|
-
63
|
975
|
-
2
|
976
|
-
47
|
977
|
-
49
|
978
|
-
3
|
979
|
-
1
|
980
|
-
49
|
981
|
-
6
|
982
929
|
1
|
983
|
-
49
|
984
|
-
7
|
985
|
-
0
|
986
|
-
19
|
987
|
-
0
|
988
930
|
8
|
989
|
-
|
990
|
-
1
|
991
|
-
8
|
992
|
-
96
|
931
|
+
35
|
993
932
|
1
|
994
933
|
11
|
995
934
|
I
|
996
|
-
|
935
|
+
3
|
997
936
|
I
|
998
|
-
|
937
|
+
0
|
999
938
|
I
|
1000
939
|
0
|
1001
940
|
I
|
1002
941
|
0
|
1003
942
|
n
|
1004
943
|
p
|
1005
|
-
|
944
|
+
10
|
1006
945
|
x
|
1007
946
|
4
|
1008
947
|
File
|
@@ -1016,38 +955,72 @@ scope
|
|
1016
955
|
x
|
1017
956
|
7
|
1018
957
|
exists?
|
1019
|
-
n
|
1020
958
|
x
|
1021
|
-
|
1022
|
-
|
959
|
+
3
|
960
|
+
Dir
|
961
|
+
n
|
962
|
+
s
|
963
|
+
1
|
964
|
+
.
|
965
|
+
M
|
966
|
+
1
|
967
|
+
p
|
968
|
+
2
|
1023
969
|
x
|
1024
|
-
|
1025
|
-
|
970
|
+
9
|
971
|
+
for_block
|
972
|
+
t
|
1026
973
|
n
|
1027
974
|
x
|
1028
|
-
|
1029
|
-
|
1030
|
-
|
975
|
+
17
|
976
|
+
revision_from_git
|
977
|
+
i
|
978
|
+
9
|
979
|
+
5
|
980
|
+
7
|
981
|
+
0
|
982
|
+
64
|
983
|
+
47
|
984
|
+
49
|
985
|
+
1
|
986
|
+
1
|
1031
987
|
11
|
1032
|
-
|
1033
|
-
x
|
988
|
+
I
|
1034
989
|
3
|
1035
|
-
|
1036
|
-
|
990
|
+
I
|
991
|
+
0
|
992
|
+
I
|
993
|
+
0
|
994
|
+
I
|
995
|
+
0
|
996
|
+
I
|
997
|
+
-2
|
998
|
+
p
|
1037
999
|
2
|
1038
|
-
=~
|
1039
|
-
n
|
1040
1000
|
s
|
1041
|
-
|
1042
|
-
|
1001
|
+
18
|
1002
|
+
git rev-parse HEAD
|
1043
1003
|
x
|
1044
|
-
|
1045
|
-
|
1004
|
+
1
|
1005
|
+
`
|
1006
|
+
p
|
1007
|
+
3
|
1008
|
+
I
|
1009
|
+
0
|
1010
|
+
I
|
1011
|
+
2c
|
1012
|
+
I
|
1013
|
+
9
|
1046
1014
|
x
|
1047
|
-
|
1048
|
-
|
1015
|
+
52
|
1016
|
+
/Users/chris/Projects/compass/lib/compass/version.rb
|
1049
1017
|
p
|
1050
|
-
|
1018
|
+
0
|
1019
|
+
x
|
1020
|
+
5
|
1021
|
+
chdir
|
1022
|
+
p
|
1023
|
+
9
|
1051
1024
|
I
|
1052
1025
|
-1
|
1053
1026
|
I
|
@@ -1061,31 +1034,16 @@ I
|
|
1061
1034
|
I
|
1062
1035
|
2b
|
1063
1036
|
I
|
1064
|
-
|
1065
|
-
I
|
1066
|
-
2c
|
1067
|
-
I
|
1068
|
-
3d
|
1069
|
-
I
|
1070
|
-
2d
|
1071
|
-
I
|
1072
|
-
5c
|
1073
|
-
I
|
1074
|
-
2c
|
1075
|
-
I
|
1076
|
-
5f
|
1037
|
+
22
|
1077
1038
|
I
|
1078
1039
|
2a
|
1079
1040
|
I
|
1080
|
-
|
1041
|
+
24
|
1081
1042
|
x
|
1082
1043
|
52
|
1083
1044
|
/Users/chris/Projects/compass/lib/compass/version.rb
|
1084
1045
|
p
|
1085
|
-
|
1086
|
-
x
|
1087
|
-
3
|
1088
|
-
rev
|
1046
|
+
0
|
1089
1047
|
p
|
1090
1048
|
13
|
1091
1049
|
I
|
Binary file
|
@@ -0,0 +1,29 @@
|
|
1
|
+
# Require any additional compass plugins here.
|
2
|
+
project_type = :stand_alone
|
3
|
+
css_dir = "tmp"
|
4
|
+
sass_dir = "sass"
|
5
|
+
images_dir = "images"
|
6
|
+
output_style = :compact
|
7
|
+
# To enable relative image paths using the images_url() function:
|
8
|
+
# http_images_path = :relative
|
9
|
+
http_images_path = "/images"
|
10
|
+
line_comments = false
|
11
|
+
|
12
|
+
asset_cache_buster do |path, file|
|
13
|
+
pathname = Pathname.new(path)
|
14
|
+
|
15
|
+
case pathname.basename(pathname.extname).to_s
|
16
|
+
when "grid"
|
17
|
+
new_path = "%s/%s-BUSTED%s" % [pathname.dirname, pathname.basename(pathname.extname), pathname.extname]
|
18
|
+
{:path => new_path, :query => nil}
|
19
|
+
when "feed"
|
20
|
+
"query_string"
|
21
|
+
when "dk"
|
22
|
+
{:query => "query_string"}
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
|
27
|
+
asset_host do |path|
|
28
|
+
"http://assets%d.example.com" % (path.size % 4)
|
29
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
.showgrid { background-image: url('http://assets0.example.com/images/grid-BUSTED.png'); }
|
2
|
+
|
3
|
+
.inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }
|
4
|
+
|
5
|
+
.no-buster { background-image: url('http://assets0.example.com/images/grid.png'); }
|
6
|
+
|
7
|
+
.feed { background-image: url('http://assets0.example.com/images/feed.png?query_string'); }
|
8
|
+
|
9
|
+
.dk { background-image: url('http://assets0.example.com/images/flags/dk.png?query_string'); }
|
Binary file
|
Binary file
|
Binary file
|
@@ -0,0 +1,14 @@
|
|
1
|
+
.showgrid
|
2
|
+
background-image: image-url("grid.png")
|
3
|
+
|
4
|
+
.inlinegrid
|
5
|
+
background-image: inline-image("grid.png")
|
6
|
+
|
7
|
+
.no-buster
|
8
|
+
background-image: image-url("grid.png", $only-path: false, $cache-buster: false)
|
9
|
+
|
10
|
+
.feed
|
11
|
+
background-image: image-url("feed.png")
|
12
|
+
|
13
|
+
.dk
|
14
|
+
background-image: image-url("flags/dk.png")
|
@@ -0,0 +1,9 @@
|
|
1
|
+
.showgrid { background-image: url('http://assets0.example.com/images/grid-BUSTED.png'); }
|
2
|
+
|
3
|
+
.inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }
|
4
|
+
|
5
|
+
.no-buster { background-image: url('http://assets0.example.com/images/grid.png'); }
|
6
|
+
|
7
|
+
.feed { background-image: url('http://assets0.example.com/images/feed.png?query_string'); }
|
8
|
+
|
9
|
+
.dk { background-image: url('http://assets0.example.com/images/flags/dk.png?query_string'); }
|
@@ -1,84 +1,103 @@
|
|
1
1
|
.hbox {
|
2
2
|
display: -moz-box;
|
3
3
|
display: -webkit-box;
|
4
|
+
display: -ms-box;
|
4
5
|
display: box;
|
5
6
|
-moz-box-orient: horizontal;
|
6
7
|
-webkit-box-orient: horizontal;
|
8
|
+
-ms-box-orient: horizontal;
|
7
9
|
box-orient: horizontal;
|
8
10
|
-moz-box-align: stretch;
|
9
11
|
-webkit-box-align: stretch;
|
12
|
+
-ms-box-align: stretch;
|
10
13
|
box-align: stretch; }
|
11
14
|
.hbox > * {
|
12
15
|
-moz-box-flex: 0;
|
13
16
|
-webkit-box-flex: 0;
|
17
|
+
-ms-box-flex: 0;
|
14
18
|
box-flex: 0; }
|
15
19
|
|
16
20
|
.vbox {
|
17
21
|
display: -moz-box;
|
18
22
|
display: -webkit-box;
|
23
|
+
display: -ms-box;
|
19
24
|
display: box;
|
20
25
|
-moz-box-orient: vertical;
|
21
26
|
-webkit-box-orient: vertical;
|
27
|
+
-ms-box-orient: vertical;
|
22
28
|
box-orient: vertical;
|
23
29
|
-moz-box-align: stretch;
|
24
30
|
-webkit-box-align: stretch;
|
31
|
+
-ms-box-align: stretch;
|
25
32
|
box-align: stretch; }
|
26
33
|
.vbox > * {
|
27
34
|
-moz-box-flex: 0;
|
28
35
|
-webkit-box-flex: 0;
|
36
|
+
-ms-box-flex: 0;
|
29
37
|
box-flex: 0; }
|
30
38
|
|
31
39
|
.spacer {
|
32
40
|
-moz-box-flex: 1;
|
33
41
|
-webkit-box-flex: 1;
|
42
|
+
-ms-box-flex: 1;
|
34
43
|
box-flex: 1; }
|
35
44
|
|
36
45
|
.reverse {
|
37
46
|
-moz-box-direction: reverse;
|
38
47
|
-webkit-box-direction: reverse;
|
48
|
+
-ms-box-direction: reverse;
|
39
49
|
box-direction: reverse; }
|
40
50
|
|
41
51
|
.box-flex-0 {
|
42
52
|
-moz-box-flex: 0;
|
43
53
|
-webkit-box-flex: 0;
|
54
|
+
-ms-box-flex: 0;
|
44
55
|
box-flex: 0; }
|
45
56
|
|
46
57
|
.box-flex-1 {
|
47
58
|
-moz-box-flex: 1;
|
48
59
|
-webkit-box-flex: 1;
|
60
|
+
-ms-box-flex: 1;
|
49
61
|
box-flex: 1; }
|
50
62
|
|
51
63
|
.box-flex-2 {
|
52
64
|
-moz-box-flex: 2;
|
53
65
|
-webkit-box-flex: 2;
|
66
|
+
-ms-box-flex: 2;
|
54
67
|
box-flex: 2; }
|
55
68
|
|
56
69
|
.box-flex-group-0 {
|
57
70
|
-moz-box-flex-group: 0;
|
58
71
|
-webkit-box-flex-group: 0;
|
72
|
+
-ms-box-flex-group: 0;
|
59
73
|
box-flex-group: 0; }
|
60
74
|
|
61
75
|
.box-flex-group-1 {
|
62
76
|
-moz-box-flex-group: 1;
|
63
77
|
-webkit-box-flex-group: 1;
|
78
|
+
-ms-box-flex-group: 1;
|
64
79
|
box-flex-group: 1; }
|
65
80
|
|
66
81
|
.box-flex-group-2 {
|
67
82
|
-moz-box-flex-group: 2;
|
68
83
|
-webkit-box-flex-group: 2;
|
84
|
+
-ms-box-flex-group: 2;
|
69
85
|
box-flex-group: 2; }
|
70
86
|
|
71
87
|
.start {
|
72
88
|
-moz-box-pack: start;
|
73
89
|
-webkit-box-pack: start;
|
90
|
+
-ms-box-pack: start;
|
74
91
|
box-pack: start; }
|
75
92
|
|
76
93
|
.end {
|
77
94
|
-moz-box-pack: end;
|
78
95
|
-webkit-box-pack: end;
|
96
|
+
-ms-box-pack: end;
|
79
97
|
box-pack: end; }
|
80
98
|
|
81
99
|
.center {
|
82
100
|
-moz-box-pack: center;
|
83
101
|
-webkit-box-pack: center;
|
102
|
+
-ms-box-pack: center;
|
84
103
|
box-pack: center; }
|
@@ -15,3 +15,12 @@
|
|
15
15
|
visibility: hidden; }
|
16
16
|
.pie-clearfix {
|
17
17
|
display: block; }
|
18
|
+
|
19
|
+
.simplified-pie-clearfix {
|
20
|
+
display: inline-block; }
|
21
|
+
.simplified-pie-clearfix:after {
|
22
|
+
content: "";
|
23
|
+
display: table;
|
24
|
+
clear: both; }
|
25
|
+
.simplified-pie-clearfix {
|
26
|
+
display: block; }
|