compass 1.0.0.alpha.15 → 1.0.0.alpha.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. data/RELEASE_VERSION +1 -1
  2. data/VERSION +1 -1
  3. data/lib/compass/commands/update_project.rb +5 -0
  4. data/lib/compass/compiler.rb +50 -11
  5. data/lib/compass/configuration/serialization.rb +4 -0
  6. data/lib/compass/sass_extensions/functions/sprites.rb +31 -29
  7. data/lib/compass/sass_extensions/sprites/image.rb +4 -3
  8. data/lib/compass/sass_extensions/sprites/image_methods.rb +2 -2
  9. data/lib/compass/sass_extensions/sprites/sprite_map.rb +6 -5
  10. data/lib/compass/stats.rb +1 -1
  11. data/lib/compass/watcher/compiler.rb +3 -2
  12. data/lib/compass/watcher/project_watcher.rb +4 -4
  13. data/test/fixtures/stylesheets/compass/config.rb +1 -0
  14. data/test/fixtures/stylesheets/compass/css/lists.css +4 -4
  15. data/test/fixtures/stylesheets/compass/css/vertical_rhythm.css +0 -169
  16. data/test/fixtures/stylesheets/compass/css/vertical_rhythm_with_ems.css +51 -0
  17. data/test/fixtures/stylesheets/compass/css/vertical_rhythm_with_px.css +50 -0
  18. data/test/fixtures/stylesheets/compass/css/vertical_rhythm_with_rems.css +65 -0
  19. data/test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss +0 -157
  20. data/test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_ems.scss +52 -0
  21. data/test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_px.scss +50 -0
  22. data/test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_rems.scss +50 -0
  23. data/test/fixtures/stylesheets/envtest/tmp/env.css +2 -2
  24. data/test/helpers/command_line.rb +1 -1
  25. data/test/units/configuration_test.rb +6 -0
  26. data/test/units/sass_extensions_test.rb +9 -3
  27. data/test/units/sass_extenstions/gradients_test.rb +8 -11
  28. metadata +41 -13
@@ -102,11 +102,11 @@ module Compass
102
102
 
103
103
  def sass_removed(file)
104
104
  log_action(:info, "#{filename_for_display(file)} was removed", options)
105
- css_file = compiler.corresponding_css_file(File.join(project_path, file))
105
+ css_file = compiler.corresponding_css_file(file)
106
+ sourcemap_file = compiler.corresponding_sourcemap_file(file)
106
107
  compile
107
- if File.exists?(css_file)
108
- remove(css_file)
109
- end
108
+ remove(css_file) if File.exists?(css_file)
109
+ remove(sourcemap_file) if File.exists?(sourcemap_file)
110
110
  end
111
111
 
112
112
  def local_development_locations
@@ -1,5 +1,6 @@
1
1
  # Require any additional compass plugins here.
2
2
  require 'true'
3
+ require 'compass/import-once/activate'
3
4
  project_type = :stand_alone
4
5
  css_dir = "tmp"
5
6
  sass_dir = "sass"
@@ -113,15 +113,15 @@ ul.wide-inline-block {
113
113
  ul.inline {
114
114
  list-style-type: none; }
115
115
  ul.inline, ul.inline li {
116
- margin: 0px;
117
- padding: 0px;
116
+ margin: 0;
117
+ padding: 0;
118
118
  display: inline; }
119
119
 
120
120
  ul.comma {
121
121
  list-style-type: none; }
122
122
  ul.comma, ul.comma li {
123
- margin: 0px;
124
- padding: 0px;
123
+ margin: 0;
124
+ padding: 0;
125
125
  display: inline; }
126
126
  ul.comma li:after {
127
127
  content: ", "; }
@@ -40,172 +40,3 @@ html {
40
40
 
41
41
  .reset {
42
42
  line-height: 1.14286em; }
43
-
44
- /* New test using em output */
45
- html {
46
- font-size: 112.5%;
47
- line-height: 1.4em; }
48
-
49
- .container {
50
- background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
51
- background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
52
- background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
53
- background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
54
- -moz-background-size: 100% 1.4em;
55
- -o-background-size: 100% 1.4em;
56
- -webkit-background-size: 100% 1.4em;
57
- background-size: 100% 1.4em;
58
- background-position: left top; }
59
-
60
- p {
61
- margin-top: 1.4em;
62
- margin-bottom: 1.4em; }
63
-
64
- th,
65
- td {
66
- padding-top: 0.35em;
67
- padding-bottom: 0.35em; }
68
-
69
- .caption {
70
- font-size: 0.72222em;
71
- line-height: 1.55077em; }
72
-
73
- .spaced-out {
74
- line-height: 2.1em; }
75
-
76
- blockquote {
77
- margin-top: 1.4em;
78
- margin-bottom: 1.4em;
79
- padding: 0 1.4em; }
80
-
81
- .fig-quote > blockquote {
82
- margin-bottom: 0.7em; }
83
- .fig-quote .source {
84
- font-size: 0.72222em;
85
- line-height: 1.93846em;
86
- margin-bottom: 0.96923em; }
87
-
88
- .panel {
89
- font-size: 0.88889em;
90
- line-height: 1.575em;
91
- border-width: 0.0625em;
92
- border-style: solid;
93
- border-color: #aaaaaa;
94
- padding: 1.5125em; }
95
-
96
- /* New using rem output with pixel fallbacks */
97
- html {
98
- font-size: 112.5%;
99
- line-height: 1.4em; }
100
-
101
- .container {
102
- background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
103
- background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
104
- background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
105
- background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
106
- -moz-background-size: 100% 1.4rem;
107
- -o-background-size: 100% 1.4rem;
108
- -webkit-background-size: 100% 1.4rem;
109
- background-size: 100% 1.4rem;
110
- background-position: left top; }
111
-
112
- p {
113
- margin-top: 25px;
114
- margin-top: 1.4rem;
115
- margin-bottom: 25px;
116
- margin-bottom: 1.4rem; }
117
-
118
- th,
119
- td {
120
- padding-top: 6px;
121
- padding-top: 0.35rem;
122
- padding-bottom: 6px;
123
- padding-bottom: 0.35rem; }
124
-
125
- /* Incremental leading made easy! */
126
- .caption {
127
- font-size: 15px;
128
- font-size: 0.85rem;
129
- line-height: 20px;
130
- line-height: 1.12rem; }
131
-
132
- .spaced-out {
133
- line-height: 38px;
134
- line-height: 2.1rem; }
135
-
136
- blockquote {
137
- margin-top: 25px;
138
- margin-top: 1.4rem;
139
- margin-bottom: 25px;
140
- margin-bottom: 1.4rem;
141
- padding: 0 1.4rem; }
142
-
143
- .fig-quote > blockquote {
144
- margin-bottom: 13px;
145
- margin-bottom: 0.7rem; }
146
- .fig-quote .source {
147
- font-size: 15px;
148
- font-size: 0.85rem;
149
- line-height: 25px;
150
- line-height: 1.4rem;
151
- margin-bottom: 13px;
152
- margin-bottom: 0.7rem; }
153
-
154
- .panel {
155
- border-width: 1px;
156
- border-width: 0.05556rem;
157
- border-style: solid;
158
- border-color: #aaaaaa;
159
- padding: 24px;
160
- padding: 1.34444rem; }
161
-
162
- /* New using px output */
163
- html {
164
- font-size: 18px;
165
- line-height: 25px; }
166
-
167
- .container {
168
- background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
169
- background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
170
- background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
171
- background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
172
- -moz-background-size: 100% 25px;
173
- -o-background-size: 100% 25px;
174
- -webkit-background-size: 100% 25px;
175
- background-size: 100% 25px;
176
- background-position: left top; }
177
-
178
- p {
179
- margin-top: 25px;
180
- margin-bottom: 25px; }
181
-
182
- th,
183
- td {
184
- padding-top: 6px;
185
- padding-bottom: 6px; }
186
-
187
- /* Incremental leading made easy! */
188
- .caption {
189
- font-size: 15px;
190
- line-height: 20px; }
191
-
192
- .spaced-out {
193
- line-height: 37px; }
194
-
195
- blockquote {
196
- margin-top: 25px;
197
- margin-bottom: 25px;
198
- padding: 0 25px; }
199
-
200
- .fig-quote > blockquote {
201
- margin-bottom: 12px; }
202
- .fig-quote .source {
203
- font-size: 15px;
204
- line-height: 25px;
205
- margin-bottom: 12px; }
206
-
207
- .panel {
208
- border-width: 1px;
209
- border-style: solid;
210
- border-color: #aaaaaa;
211
- padding: 24px; }
@@ -0,0 +1,51 @@
1
+ /* New test using em output */
2
+ html {
3
+ font-size: 112.5%;
4
+ line-height: 1.4em; }
5
+
6
+ .container {
7
+ background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
8
+ background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
9
+ background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
10
+ background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
11
+ -moz-background-size: 100% 1.4em;
12
+ -o-background-size: 100% 1.4em;
13
+ -webkit-background-size: 100% 1.4em;
14
+ background-size: 100% 1.4em;
15
+ background-position: left top; }
16
+
17
+ p {
18
+ margin-top: 1.4em;
19
+ margin-bottom: 1.4em; }
20
+
21
+ th,
22
+ td {
23
+ padding-top: 0.35em;
24
+ padding-bottom: 0.35em; }
25
+
26
+ .caption {
27
+ font-size: 0.72222em;
28
+ line-height: 1.55077em; }
29
+
30
+ .spaced-out {
31
+ line-height: 2.1em; }
32
+
33
+ blockquote {
34
+ margin-top: 1.4em;
35
+ margin-bottom: 1.4em;
36
+ padding: 0 1.4em; }
37
+
38
+ .fig-quote > blockquote {
39
+ margin-bottom: 0.7em; }
40
+ .fig-quote .source {
41
+ font-size: 0.72222em;
42
+ line-height: 1.93846em;
43
+ margin-bottom: 0.96923em; }
44
+
45
+ .panel {
46
+ font-size: 0.88889em;
47
+ line-height: 1.575em;
48
+ border-width: 0.0625em;
49
+ border-style: solid;
50
+ border-color: #aaaaaa;
51
+ padding: 1.5125em; }
@@ -0,0 +1,50 @@
1
+ /* New using px output */
2
+ html {
3
+ font-size: 18px;
4
+ line-height: 25px; }
5
+
6
+ .container {
7
+ background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
8
+ background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
9
+ background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
10
+ background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
11
+ -moz-background-size: 100% 25px;
12
+ -o-background-size: 100% 25px;
13
+ -webkit-background-size: 100% 25px;
14
+ background-size: 100% 25px;
15
+ background-position: left top; }
16
+
17
+ p {
18
+ margin-top: 25px;
19
+ margin-bottom: 25px; }
20
+
21
+ th,
22
+ td {
23
+ padding-top: 6px;
24
+ padding-bottom: 6px; }
25
+
26
+ /* Incremental leading made easy! */
27
+ .caption {
28
+ font-size: 15px;
29
+ line-height: 20px; }
30
+
31
+ .spaced-out {
32
+ line-height: 37px; }
33
+
34
+ blockquote {
35
+ margin-top: 25px;
36
+ margin-bottom: 25px;
37
+ padding: 0 25px; }
38
+
39
+ .fig-quote > blockquote {
40
+ margin-bottom: 12px; }
41
+ .fig-quote .source {
42
+ font-size: 15px;
43
+ line-height: 25px;
44
+ margin-bottom: 12px; }
45
+
46
+ .panel {
47
+ border-width: 1px;
48
+ border-style: solid;
49
+ border-color: #aaaaaa;
50
+ padding: 24px; }
@@ -0,0 +1,65 @@
1
+ /* New using rem output with pixel fallbacks */
2
+ html {
3
+ font-size: 112.5%;
4
+ line-height: 1.4em; }
5
+
6
+ .container {
7
+ background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
8
+ background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
9
+ background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
10
+ background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%);
11
+ -moz-background-size: 100% 1.4rem;
12
+ -o-background-size: 100% 1.4rem;
13
+ -webkit-background-size: 100% 1.4rem;
14
+ background-size: 100% 1.4rem;
15
+ background-position: left top; }
16
+
17
+ p {
18
+ margin-top: 25px;
19
+ margin-top: 1.4rem;
20
+ margin-bottom: 25px;
21
+ margin-bottom: 1.4rem; }
22
+
23
+ th,
24
+ td {
25
+ padding-top: 6px;
26
+ padding-top: 0.35rem;
27
+ padding-bottom: 6px;
28
+ padding-bottom: 0.35rem; }
29
+
30
+ /* Incremental leading made easy! */
31
+ .caption {
32
+ font-size: 15px;
33
+ font-size: 0.85rem;
34
+ line-height: 20px;
35
+ line-height: 1.12rem; }
36
+
37
+ .spaced-out {
38
+ line-height: 38px;
39
+ line-height: 2.1rem; }
40
+
41
+ blockquote {
42
+ margin-top: 25px;
43
+ margin-top: 1.4rem;
44
+ margin-bottom: 25px;
45
+ margin-bottom: 1.4rem;
46
+ padding: 0 1.4rem; }
47
+
48
+ .fig-quote > blockquote {
49
+ margin-bottom: 13px;
50
+ margin-bottom: 0.7rem; }
51
+ .fig-quote .source {
52
+ font-size: 15px;
53
+ font-size: 0.85rem;
54
+ line-height: 25px;
55
+ line-height: 1.4rem;
56
+ margin-bottom: 13px;
57
+ margin-bottom: 0.7rem; }
58
+
59
+ .panel {
60
+ border-width: 1px;
61
+ border-width: 0.05556rem;
62
+ border-style: solid;
63
+ border-color: #aaaaaa;
64
+ padding: 24px;
65
+ padding: 1.34444rem; }
@@ -58,160 +58,3 @@ $base-line-height: 16px;
58
58
  .reset {
59
59
  @include reset-baseline;
60
60
  }
61
-
62
-
63
- /* New test using em output */
64
- $base-font-size: 18px;
65
- $base-line-height: $base-font-size * 1.4;
66
- $rhythm-unit: em;
67
- $default-rhythm-border-style: solid #aaa;
68
-
69
- @import "compass/typography/vertical_rhythm";
70
-
71
- @include establish-baseline;
72
-
73
- .container {
74
- @include debug-vertical-alignment;
75
- }
76
-
77
- p {
78
- @include margin-leader;
79
- @include margin-trailer;
80
- }
81
-
82
- th,
83
- td {
84
- @include rhythm-padding(.25);
85
- }
86
-
87
- // Incremental leading made easy!
88
- .caption {
89
- @include adjust-font-size-to(13px, 4/5);
90
- }
91
-
92
- .spaced-out {
93
- @include adjust-leading-to(1.5);
94
- }
95
-
96
- blockquote {
97
- @include rhythm-margins;
98
- padding: 0 rhythm();
99
- }
100
-
101
- .fig-quote {
102
- > blockquote {
103
- @include trailer(.5);
104
- }
105
- .source {
106
- @include adjust-font-size-to(13px, auto);
107
- @include trailer(.5, 13px);
108
- }
109
- }
110
-
111
- .panel {
112
- @include adjust-font-size-to(16px);
113
- @include rhythm-borders($font-size: 16px);
114
- }
115
-
116
- /* New using rem output with pixel fallbacks */
117
- $base-font-size: 18px;
118
- $base-line-height: $base-font-size * 1.4;
119
- $rhythm-unit: rem;
120
- $default-rhythm-border-style: solid #aaa;
121
- @import "compass/typography/vertical_rhythm";
122
-
123
- @include establish-baseline;
124
-
125
- .container {
126
- @include debug-vertical-alignment;
127
- }
128
-
129
- p {
130
- @include margin-leader;
131
- @include margin-trailer;
132
- }
133
-
134
- th,
135
- td {
136
- @include rhythm-padding(.25);
137
- }
138
-
139
- /* Incremental leading made easy! */
140
- .caption {
141
- @include adjust-font-size-to(.85rem, 4/5);
142
- }
143
-
144
- .spaced-out {
145
- @include adjust-leading-to(1.5);
146
- }
147
-
148
- blockquote {
149
- @include rhythm-margins;
150
- padding: 0 rhythm();
151
- }
152
-
153
- .fig-quote {
154
- > blockquote {
155
- @include trailer(.5);
156
- }
157
- .source {
158
- @include adjust-font-size-to(.85rem, auto);
159
- @include trailer(.5);
160
- }
161
- }
162
-
163
- .panel {
164
- @include rhythm-borders;
165
- }
166
-
167
- /* New using px output */
168
- $base-font-size: 18px;
169
- $base-line-height: $base-font-size * 1.4;
170
- $rhythm-unit: px;
171
- $default-rhythm-border-style: solid #aaa;
172
- @import "compass/typography/vertical_rhythm";
173
-
174
- @include establish-baseline;
175
-
176
- .container {
177
- @include debug-vertical-alignment;
178
- }
179
-
180
- p {
181
- @include margin-leader;
182
- @include margin-trailer;
183
- }
184
-
185
- th,
186
- td {
187
- @include rhythm-padding(.25);
188
- }
189
-
190
- /* Incremental leading made easy! */
191
- .caption {
192
- @include adjust-font-size-to(.85rem, 4/5);
193
- }
194
-
195
- .spaced-out {
196
- @include adjust-leading-to(1.5);
197
- }
198
-
199
- blockquote {
200
- @include rhythm-margins;
201
- padding: 0 rhythm();
202
- }
203
-
204
- .fig-quote {
205
- > blockquote {
206
- @include trailer(.5);
207
- }
208
- .source {
209
- @include adjust-font-size-to(.85rem, auto);
210
- @include trailer(.5);
211
- }
212
- }
213
-
214
- .panel {
215
- @include rhythm-borders;
216
- }
217
-