compass 0.12.alpha.3 → 0.12.alpha.4
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss +1 -0
- data/frameworks/compass/stylesheets/compass/css3/_box-sizing.scss +1 -1
- data/frameworks/compass/stylesheets/compass/css3/_transition.scss +7 -7
- data/frameworks/compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss +7 -5
- data/lib/compass/commands/update_project.rb +12 -0
- data/lib/compass/sass_extensions/functions/sprites.rb +7 -0
- data/test/fixtures/stylesheets/compass/css/box-sizeing.css +9 -0
- data/test/fixtures/stylesheets/compass/css/transition.css +16 -0
- data/test/fixtures/stylesheets/compass/css/utilities.css +20 -0
- data/test/fixtures/stylesheets/compass/sass/box-sizeing.scss +8 -0
- data/test/fixtures/stylesheets/compass/sass/transition.scss +2 -0
- data/test/fixtures/stylesheets/compass/sass/utilities.scss +3 -0
- data/test/integrations/sprites_test.rb +27 -1
- metadata +81 -43
data/VERSION.yml
CHANGED
@@ -30,7 +30,7 @@ $default-transition-delay: false !default;
|
|
30
30
|
|
31
31
|
@mixin transition-property($properties: $default-transition-property) {
|
32
32
|
@include experimental(transition-property, unquote($properties),
|
33
|
-
-moz, -webkit, -o,
|
33
|
+
-moz, -webkit, -o, -ms, not -khtml, official
|
34
34
|
);
|
35
35
|
}
|
36
36
|
|
@@ -42,7 +42,7 @@ $default-transition-delay: false !default;
|
|
42
42
|
@mixin transition-duration($duration: $default-transition-duration) {
|
43
43
|
@if type-of($duration) == string { $duration: unquote($duration); }
|
44
44
|
@include experimental(transition-duration, $duration,
|
45
|
-
-moz, -webkit, -o,
|
45
|
+
-moz, -webkit, -o, -ms, not -khtml, official
|
46
46
|
);
|
47
47
|
}
|
48
48
|
|
@@ -54,7 +54,7 @@ $default-transition-delay: false !default;
|
|
54
54
|
|
55
55
|
@mixin transition-timing-function($function: $default-transition-function) {
|
56
56
|
@include experimental(transition-timing-function, unquote($function),
|
57
|
-
-moz, -webkit, -o,
|
57
|
+
-moz, -webkit, -o, -ms, not -khtml, official
|
58
58
|
);
|
59
59
|
}
|
60
60
|
|
@@ -66,7 +66,7 @@ $default-transition-delay: false !default;
|
|
66
66
|
@mixin transition-delay($delay: $default-transition-delay) {
|
67
67
|
@if type-of($delay) == string { $delay: unquote($delay); }
|
68
68
|
@include experimental(transition-delay, $delay,
|
69
|
-
-moz, -webkit, -o,
|
69
|
+
-moz, -webkit, -o, -ms, not -khtml, official
|
70
70
|
);
|
71
71
|
}
|
72
72
|
|
@@ -87,7 +87,7 @@ $default-transition-delay: false !default;
|
|
87
87
|
-moz,
|
88
88
|
not -webkit,
|
89
89
|
-o,
|
90
|
-
|
90
|
+
-ms,
|
91
91
|
not -khtml,
|
92
92
|
official
|
93
93
|
);
|
@@ -97,7 +97,7 @@ $default-transition-delay: false !default;
|
|
97
97
|
-moz,
|
98
98
|
-webkit,
|
99
99
|
-o,
|
100
|
-
|
100
|
+
-ms,
|
101
101
|
not -khtml,
|
102
102
|
official
|
103
103
|
);
|
@@ -128,6 +128,6 @@ $default-transition-delay: false !default;
|
|
128
128
|
}
|
129
129
|
$transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
|
130
130
|
@include experimental(transition, $transition,
|
131
|
-
-moz, -webkit, -o,
|
131
|
+
-moz, -webkit, -o, -ms, not -khtml, official
|
132
132
|
);
|
133
133
|
}
|
data/frameworks/compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss
CHANGED
@@ -3,11 +3,13 @@
|
|
3
3
|
background-color: $header-color;
|
4
4
|
&.even, &:nth-child(2n) {
|
5
5
|
background-color: $header-color - $dark-intersection; } }
|
6
|
-
tr
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
6
|
+
tr {
|
7
|
+
&.odd, &:nth-child(2n+1) {
|
8
|
+
td {
|
9
|
+
background-color: $odd-row-color;
|
10
|
+
&.even, &:nth-child(2n) {
|
11
|
+
background-color: $odd-row-color - $dark-intersection; } } }
|
12
|
+
}
|
11
13
|
tr.even {
|
12
14
|
td {
|
13
15
|
background-color: $even-row-color;
|
@@ -17,6 +17,14 @@ module Compass
|
|
17
17
|
opts.on("--time", "Display compilation times.") do
|
18
18
|
self.options[:time] = true
|
19
19
|
end
|
20
|
+
|
21
|
+
opts.on("--debug-info", "Turns on sass's debuging information") do
|
22
|
+
self.options[:debug_info]= true
|
23
|
+
end
|
24
|
+
|
25
|
+
opts.on("--no-debug-info", "Turns on sass's debuging information") do
|
26
|
+
self.options[:debug_info]= false
|
27
|
+
end
|
20
28
|
super
|
21
29
|
end
|
22
30
|
end
|
@@ -56,6 +64,10 @@ module Compass
|
|
56
64
|
compiler_opts.merge!(options)
|
57
65
|
compiler_opts[:sass_files] = explicit_sass_files
|
58
66
|
compiler_opts[:cache_location] = determine_cache_location
|
67
|
+
if options.include?(:debug_info) && options[:debug_info]
|
68
|
+
compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
|
69
|
+
end
|
70
|
+
puts compiler_opts.inspect
|
59
71
|
compiler_opts
|
60
72
|
end
|
61
73
|
|
@@ -9,6 +9,13 @@ module Compass::SassExtensions::Functions::Sprites
|
|
9
9
|
self[variable_name.to_s.gsub(/-/,"_")]
|
10
10
|
end
|
11
11
|
end
|
12
|
+
|
13
|
+
#Returns a list of all sprite names
|
14
|
+
def sprite_names(map)
|
15
|
+
Sass::Script::List.new(map.sprite_names.map { |f| Sass::Script::String.new(f) }, ' ')
|
16
|
+
end
|
17
|
+
Sass::Script::Functions.declare :sprite_names, [:map]
|
18
|
+
|
12
19
|
# Returns the system path of the sprite file
|
13
20
|
def sprite_path(map)
|
14
21
|
Sass::Script::String.new(map.name_and_hash)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
.single-transition-without-delay {
|
2
2
|
-webkit-transition: all 0.6s ease-out;
|
3
3
|
-moz-transition: all 0.6s ease-out;
|
4
|
+
-ms-transition: all 0.6s ease-out;
|
4
5
|
-o-transition: all 0.6s ease-out;
|
5
6
|
transition: all 0.6s ease-out; }
|
6
7
|
|
@@ -8,5 +9,20 @@
|
|
8
9
|
-webkit-transition: all 0.6s ease-out;
|
9
10
|
-webkit-transition-delay: 0.2s;
|
10
11
|
-moz-transition: all 0.6s ease-out 0.2s;
|
12
|
+
-ms-transition: all 0.6s ease-out 0.2s;
|
11
13
|
-o-transition: all 0.6s ease-out 0.2s;
|
12
14
|
transition: all 0.6s ease-out 0.2s; }
|
15
|
+
|
16
|
+
.transition-duration-string {
|
17
|
+
-webkit-transition-duration: 0.2s, 0.5s, 0.2s;
|
18
|
+
-moz-transition-duration: 0.2s, 0.5s, 0.2s;
|
19
|
+
-ms-transition-duration: 0.2s, 0.5s, 0.2s;
|
20
|
+
-o-transition-duration: 0.2s, 0.5s, 0.2s;
|
21
|
+
transition-duration: 0.2s, 0.5s, 0.2s; }
|
22
|
+
|
23
|
+
.transition-duration-list {
|
24
|
+
-webkit-transition-duration: 0.2s, 0.5s, 0.2s;
|
25
|
+
-moz-transition-duration: 0.2s, 0.5s, 0.2s;
|
26
|
+
-ms-transition-duration: 0.2s, 0.5s, 0.2s;
|
27
|
+
-o-transition-duration: 0.2s, 0.5s, 0.2s;
|
28
|
+
transition-duration: 0.2s, 0.5s, 0.2s; }
|
@@ -34,3 +34,23 @@ p.light-with-args {
|
|
34
34
|
p.dark-with-args {
|
35
35
|
background-color: #5f1210;
|
36
36
|
color: blue; }
|
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; }
|
@@ -2,3 +2,5 @@
|
|
2
2
|
|
3
3
|
.single-transition-without-delay { @include single-transition(all, 0.6s, ease-out); }
|
4
4
|
.single-transition-with-delay { @include single-transition(all, 0.6s, ease-out, 0.2s); }
|
5
|
+
.transition-duration-string { @include transition-duration("0.2s, 0.5s, 0.2s"); }
|
6
|
+
.transition-duration-list { @include transition-duration((0.2s, 0.5s, 0.2s)); }
|
@@ -15,3 +15,6 @@ p.light { @include contrasted(#B0201E); }
|
|
15
15
|
p.dark { @include contrasted(#5F1210); }
|
16
16
|
p.light-with-args { @include contrasted(#B0201E, green, blue); }
|
17
17
|
p.dark-with-args { @include contrasted(#5F1210, green, blue); }
|
18
|
+
|
19
|
+
|
20
|
+
@include alternating-rows-and-columns(red, white, blue);
|
@@ -807,11 +807,37 @@ class SpritesTest < Test::Unit::TestCase
|
|
807
807
|
}
|
808
808
|
.colors-blue {
|
809
809
|
background-position:0 0;
|
810
|
-
}
|
810
|
+
}
|
811
|
+
.colors-yellow {
|
811
812
|
background-position:0 -10px;
|
812
813
|
}
|
813
814
|
CSS
|
814
815
|
assert_correct clean(css), clean(other_css)
|
815
816
|
end
|
816
817
|
|
818
|
+
it "should have a sprite_name function that returns the names of the sprites in a sass list" do
|
819
|
+
css = render <<-SCSS
|
820
|
+
$colors-inline:true;
|
821
|
+
@import "colors/*.png";
|
822
|
+
@each $color in sprite_names($colors-sprites) {
|
823
|
+
.\#{$color} {
|
824
|
+
width:0px;
|
825
|
+
}
|
826
|
+
}
|
827
|
+
SCSS
|
828
|
+
other_css = <<-CSS
|
829
|
+
.colors-sprite {
|
830
|
+
background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAUCAAAAACRhfOKAAAAHElEQVR42mM5wQADLP8JMRlIUIvE/IdgctLTNgCHDhEQVD4ceAAAAABJRU5ErkJggg==');
|
831
|
+
}
|
832
|
+
.blue {
|
833
|
+
width:0px;
|
834
|
+
}
|
835
|
+
.yellow {
|
836
|
+
width:0px;
|
837
|
+
}
|
838
|
+
CSS
|
839
|
+
assert_correct clean(css), clean(other_css)
|
840
|
+
|
841
|
+
end
|
842
|
+
|
817
843
|
end
|
metadata
CHANGED
@@ -1,10 +1,16 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: compass
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
hash: -3702664252
|
5
5
|
prerelease: 5
|
6
|
+
segments:
|
7
|
+
- 0
|
8
|
+
- 12
|
9
|
+
- alpha
|
10
|
+
- 4
|
11
|
+
version: 0.12.alpha.4
|
6
12
|
platform: ruby
|
7
|
-
authors:
|
13
|
+
authors:
|
8
14
|
- Chris Eppstein
|
9
15
|
- Eric A. Meyer
|
10
16
|
- Brandon Mathis
|
@@ -13,49 +19,65 @@ authors:
|
|
13
19
|
autorequire:
|
14
20
|
bindir: bin
|
15
21
|
cert_chain: []
|
16
|
-
|
17
|
-
|
18
|
-
|
22
|
+
|
23
|
+
date: 2012-01-05 00:00:00 -08:00
|
24
|
+
default_executable:
|
25
|
+
dependencies:
|
26
|
+
- !ruby/object:Gem::Dependency
|
19
27
|
name: sass
|
20
|
-
|
28
|
+
prerelease: false
|
29
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
21
30
|
none: false
|
22
|
-
requirements:
|
31
|
+
requirements:
|
23
32
|
- - ~>
|
24
|
-
- !ruby/object:Gem::Version
|
25
|
-
|
33
|
+
- !ruby/object:Gem::Version
|
34
|
+
hash: 5
|
35
|
+
segments:
|
36
|
+
- 3
|
37
|
+
- 1
|
38
|
+
version: "3.1"
|
26
39
|
type: :runtime
|
27
|
-
|
28
|
-
|
29
|
-
- !ruby/object:Gem::Dependency
|
40
|
+
version_requirements: *id001
|
41
|
+
- !ruby/object:Gem::Dependency
|
30
42
|
name: chunky_png
|
31
|
-
|
43
|
+
prerelease: false
|
44
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
32
45
|
none: false
|
33
|
-
requirements:
|
46
|
+
requirements:
|
34
47
|
- - ~>
|
35
|
-
- !ruby/object:Gem::Version
|
36
|
-
|
48
|
+
- !ruby/object:Gem::Version
|
49
|
+
hash: 11
|
50
|
+
segments:
|
51
|
+
- 1
|
52
|
+
- 2
|
53
|
+
version: "1.2"
|
37
54
|
type: :runtime
|
38
|
-
|
39
|
-
|
40
|
-
- !ruby/object:Gem::Dependency
|
55
|
+
version_requirements: *id002
|
56
|
+
- !ruby/object:Gem::Dependency
|
41
57
|
name: fssm
|
42
|
-
|
58
|
+
prerelease: false
|
59
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
43
60
|
none: false
|
44
|
-
requirements:
|
45
|
-
- -
|
46
|
-
- !ruby/object:Gem::Version
|
61
|
+
requirements:
|
62
|
+
- - ">="
|
63
|
+
- !ruby/object:Gem::Version
|
64
|
+
hash: 25
|
65
|
+
segments:
|
66
|
+
- 0
|
67
|
+
- 2
|
68
|
+
- 7
|
47
69
|
version: 0.2.7
|
48
70
|
type: :runtime
|
49
|
-
|
50
|
-
|
51
|
-
description: Compass is a Sass-based Stylesheet Framework that streamlines the creation
|
52
|
-
and maintainance of CSS.
|
71
|
+
version_requirements: *id003
|
72
|
+
description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.
|
53
73
|
email: chris@eppsteins.net
|
54
|
-
executables:
|
74
|
+
executables:
|
55
75
|
- compass
|
56
76
|
extensions: []
|
77
|
+
|
57
78
|
extra_rdoc_files: []
|
58
|
-
|
79
|
+
|
80
|
+
files:
|
59
81
|
- README.markdown
|
60
82
|
- LICENSE.markdown
|
61
83
|
- VERSION.yml
|
@@ -899,6 +921,7 @@ files:
|
|
899
921
|
- test/fixtures/stylesheets/compass/100x150.jpg
|
900
922
|
- test/fixtures/stylesheets/compass/config.rb
|
901
923
|
- test/fixtures/stylesheets/compass/css/border_radius.css
|
924
|
+
- test/fixtures/stylesheets/compass/css/box-sizeing.css
|
902
925
|
- test/fixtures/stylesheets/compass/css/box.css
|
903
926
|
- test/fixtures/stylesheets/compass/css/box_shadow.css
|
904
927
|
- test/fixtures/stylesheets/compass/css/columns.css
|
@@ -1177,6 +1200,7 @@ files:
|
|
1177
1200
|
- test/fixtures/stylesheets/compass/images/flag/zw.png
|
1178
1201
|
- test/fixtures/stylesheets/compass/images/flag-s4798b5a210.png
|
1179
1202
|
- test/fixtures/stylesheets/compass/sass/border_radius.scss
|
1203
|
+
- test/fixtures/stylesheets/compass/sass/box-sizeing.scss
|
1180
1204
|
- test/fixtures/stylesheets/compass/sass/box.sass
|
1181
1205
|
- test/fixtures/stylesheets/compass/sass/box_shadow.scss
|
1182
1206
|
- test/fixtures/stylesheets/compass/sass/columns.scss
|
@@ -1279,31 +1303,43 @@ files:
|
|
1279
1303
|
- features/rails_integration.feature
|
1280
1304
|
- features/step_definitions/command_line_steps.rb
|
1281
1305
|
- features/step_definitions/extension_steps.rb
|
1306
|
+
has_rdoc: true
|
1282
1307
|
homepage: http://compass-style.org
|
1283
1308
|
licenses: []
|
1309
|
+
|
1284
1310
|
post_install_message:
|
1285
1311
|
rdoc_options: []
|
1286
|
-
|
1312
|
+
|
1313
|
+
require_paths:
|
1287
1314
|
- lib
|
1288
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
1315
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
1289
1316
|
none: false
|
1290
|
-
requirements:
|
1291
|
-
- -
|
1292
|
-
- !ruby/object:Gem::Version
|
1293
|
-
|
1294
|
-
|
1317
|
+
requirements:
|
1318
|
+
- - ">="
|
1319
|
+
- !ruby/object:Gem::Version
|
1320
|
+
hash: 3
|
1321
|
+
segments:
|
1322
|
+
- 0
|
1323
|
+
version: "0"
|
1324
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
1295
1325
|
none: false
|
1296
|
-
requirements:
|
1297
|
-
- -
|
1298
|
-
- !ruby/object:Gem::Version
|
1326
|
+
requirements:
|
1327
|
+
- - ">"
|
1328
|
+
- !ruby/object:Gem::Version
|
1329
|
+
hash: 25
|
1330
|
+
segments:
|
1331
|
+
- 1
|
1332
|
+
- 3
|
1333
|
+
- 1
|
1299
1334
|
version: 1.3.1
|
1300
1335
|
requirements: []
|
1336
|
+
|
1301
1337
|
rubyforge_project:
|
1302
|
-
rubygems_version: 1.
|
1338
|
+
rubygems_version: 1.4.2
|
1303
1339
|
signing_key:
|
1304
1340
|
specification_version: 3
|
1305
1341
|
summary: A Real Stylesheet Framework
|
1306
|
-
test_files:
|
1342
|
+
test_files:
|
1307
1343
|
- test/fixtures/extensions/only_stylesheets/compass_init.rb
|
1308
1344
|
- test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss
|
1309
1345
|
- test/fixtures/fonts/bgrove.base64.txt
|
@@ -1395,6 +1431,7 @@ test_files:
|
|
1395
1431
|
- test/fixtures/stylesheets/compass/100x150.jpg
|
1396
1432
|
- test/fixtures/stylesheets/compass/config.rb
|
1397
1433
|
- test/fixtures/stylesheets/compass/css/border_radius.css
|
1434
|
+
- test/fixtures/stylesheets/compass/css/box-sizeing.css
|
1398
1435
|
- test/fixtures/stylesheets/compass/css/box.css
|
1399
1436
|
- test/fixtures/stylesheets/compass/css/box_shadow.css
|
1400
1437
|
- test/fixtures/stylesheets/compass/css/columns.css
|
@@ -1673,6 +1710,7 @@ test_files:
|
|
1673
1710
|
- test/fixtures/stylesheets/compass/images/flag/zw.png
|
1674
1711
|
- test/fixtures/stylesheets/compass/images/flag-s4798b5a210.png
|
1675
1712
|
- test/fixtures/stylesheets/compass/sass/border_radius.scss
|
1713
|
+
- test/fixtures/stylesheets/compass/sass/box-sizeing.scss
|
1676
1714
|
- test/fixtures/stylesheets/compass/sass/box.sass
|
1677
1715
|
- test/fixtures/stylesheets/compass/sass/box_shadow.scss
|
1678
1716
|
- test/fixtures/stylesheets/compass/sass/columns.scss
|