sass 3.4.24 → 3.4.25

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 (62) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +39 -10
  3. data/VERSION +1 -1
  4. data/VERSION_DATE +1 -1
  5. data/lib/sass.rb +3 -3
  6. data/lib/sass/css.rb +1 -1
  7. data/lib/sass/deprecation.rb +55 -0
  8. data/lib/sass/engine.rb +13 -5
  9. data/lib/sass/environment.rb +1 -1
  10. data/lib/sass/plugin.rb +1 -1
  11. data/lib/sass/plugin/compiler.rb +1 -1
  12. data/lib/sass/plugin/configuration.rb +1 -1
  13. data/lib/sass/plugin/rack.rb +2 -2
  14. data/lib/sass/plugin/staleness_checker.rb +1 -1
  15. data/lib/sass/script.rb +1 -1
  16. data/lib/sass/script/functions.rb +2 -2
  17. data/lib/sass/script/lexer.rb +1 -1
  18. data/lib/sass/script/parser.rb +4 -3
  19. data/lib/sass/script/tree/node.rb +1 -1
  20. data/lib/sass/script/tree/operation.rb +43 -16
  21. data/lib/sass/script/value/base.rb +1 -1
  22. data/lib/sass/script/value/string.rb +5 -12
  23. data/lib/sass/scss/static_parser.rb +7 -0
  24. data/lib/sass/selector/comma_sequence.rb +13 -1
  25. data/lib/sass/selector/simple.rb +1 -0
  26. data/lib/sass/tree/node.rb +2 -2
  27. data/lib/sass/tree/rule_node.rb +13 -4
  28. data/lib/sass/tree/visitors/deep_copy.rb +1 -1
  29. data/lib/sass/tree/visitors/perform.rb +3 -2
  30. data/test/sass/conversion_test.rb +3 -3
  31. data/test/sass/css2sass_test.rb +1 -1
  32. data/test/sass/engine_test.rb +56 -50
  33. data/test/sass/extend_test.rb +14 -8
  34. data/test/sass/functions_test.rb +5 -2
  35. data/test/sass/more_templates/more1.sass +10 -10
  36. data/test/sass/more_templates/more_import.sass +2 -2
  37. data/test/sass/plugin_test.rb +3 -3
  38. data/test/sass/script_test.rb +38 -29
  39. data/test/sass/scss/css_test.rb +2 -2
  40. data/test/sass/scss/scss_test.rb +25 -10
  41. data/test/sass/source_map_test.rb +13 -13
  42. data/test/sass/templates/_partial.sass +1 -1
  43. data/test/sass/templates/basic.sass +10 -10
  44. data/test/sass/templates/bork1.sass +1 -1
  45. data/test/sass/templates/bork5.sass +1 -1
  46. data/test/sass/templates/compact.sass +10 -10
  47. data/test/sass/templates/complex.sass +187 -187
  48. data/test/sass/templates/compressed.sass +10 -10
  49. data/test/sass/templates/expanded.sass +10 -10
  50. data/test/sass/templates/import.sass +2 -2
  51. data/test/sass/templates/importee.sass +3 -3
  52. data/test/sass/templates/mixins.sass +22 -22
  53. data/test/sass/templates/multiline.sass +4 -4
  54. data/test/sass/templates/nested.sass +13 -13
  55. data/test/sass/templates/parent_ref.sass +12 -12
  56. data/test/sass/templates/script.sass +70 -70
  57. data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
  58. data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
  59. data/test/sass/templates/subdir/subdir.sass +3 -3
  60. data/test/sass/templates/units.sass +10 -10
  61. data/test/sass/util/multibyte_string_scanner_test.rb +10 -2
  62. metadata +25 -24
data/test/sass/templates/bork1.sass CHANGED
@@ -1,2 +1,2 @@
1
1
  bork
2
- :bork $bork
2
+ bork: $bork
data/test/sass/templates/bork5.sass CHANGED
@@ -1,3 +1,3 @@
1
1
  bork
2
2
  /* foo */
3
- :bork $bork
3
+ bork: $bork
data/test/sass/templates/compact.sass CHANGED
@@ -1,17 +1,17 @@
1
1
  #main
2
- :width 15em
3
- :color #0000ff
2
+ width: 15em
3
+ color: #0000ff
4
4
  p
5
- :border
6
- :style dotted
5
+ border:
6
+ style: dotted
7
7
  /* Nested comment
8
8
  More nested stuff
9
- :width 2px
9
+ width: 2px
10
10
  .cool
11
- :width 100px
11
+ width: 100px
12
12
 
13
13
  #left
14
- :font
15
- :size 2em
16
- :weight bold
17
- :float left
14
+ font:
15
+ size: 2em
16
+ weight: bold
17
+ float: left
data/test/sass/templates/complex.sass CHANGED
@@ -1,305 +1,305 @@
1
1
  body
2
- :margin 0
3
- :font 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif
4
- :color #fff
5
- :background url(/images/global_bg.gif)
2
+ margin: 0
3
+ font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif
4
+ color: #fff
5
+ background: url(/images/global_bg.gif)
6
6
 
7
7
  #page
8
- :width 900px
9
- :margin 0 auto
10
- :background #440008
11
- :border-top
12
- :width 5px
13
- :style solid
14
- :color #ff8500
8
+ width: 900px
9
+ margin: 0 auto
10
+ background: #440008
11
+ border-top:
12
+ width: 5px
13
+ style: solid
14
+ color: #ff8500
15
15
 
16
16
  #header
17
- :height 75px
18
- :padding 0
17
+ height: 75px
18
+ padding: 0
19
19
  h1
20
- :float left
21
- :width 274px
22
- :height 75px
23
- :margin 0
24
- :background
25
- :image url(/images/global_logo.gif)
20
+ float: left
21
+ width: 274px
22
+ height: 75px
23
+ margin: 0
24
+ background:
25
+ image: url(/images/global_logo.gif)
26
26
  /* Crazy nested comment
27
- :repeat no-repeat
28
- :text-indent -9999px
27
+ repeat: no-repeat
28
+ text-indent: -9999px
29
29
  .status
30
- :float right
31
- :padding
32
- :top .5em
33
- :left .5em
34
- :right .5em
35
- :bottom 0
30
+ float: right
31
+ padding:
32
+ top: .5em
33
+ left: .5em
34
+ right: .5em
35
+ bottom: 0
36
36
  p
37
- :float left
38
- :margin
39
- :top 0
40
- :right 0.5em
41
- :bottom 0
42
- :left 0
37
+ float: left
38
+ margin:
39
+ top: 0
40
+ right: 0.5em
41
+ bottom: 0
42
+ left: 0
43
43
  ul
44
- :float left
45
- :margin 0
46
- :padding 0
44
+ float: left
45
+ margin: 0
46
+ padding: 0
47
47
  li
48
- :list-style-type none
49
- :display inline
50
- :margin 0 5px
48
+ list-style-type: none
49
+ display: inline
50
+ margin: 0 5px
51
51
  a:link, a:visited
52
- :color #ff8500
53
- :text-decoration none
52
+ color: #ff8500
53
+ text-decoration: none
54
54
  a:hover
55
- :text-decoration underline
55
+ text-decoration: underline
56
56
  .search
57
- :float right
58
- :clear right
59
- :margin 12px 0 0 0
57
+ float: right
58
+ clear: right
59
+ margin: 12px 0 0 0
60
60
  form
61
- :margin 0
61
+ margin: 0
62
62
  input
63
- :margin 0 3px 0 0
64
- :padding 2px
65
- :border none
63
+ margin: 0 3px 0 0
64
+ padding: 2px
65
+ border: none
66
66
 
67
67
  #menu
68
- :clear both
69
- :text-align right
70
- :height 20px
71
- :border-bottom 5px solid #006b95
72
- :background #00a4e4
68
+ clear: both
69
+ text-align: right
70
+ height: 20px
71
+ border-bottom: 5px solid #006b95
72
+ background: #00a4e4
73
73
  .contests
74
74
  ul
75
- :margin 0 5px 0 0
76
- :padding 0
75
+ margin: 0 5px 0 0
76
+ padding: 0
77
77
  li
78
- :list-style-type none
79
- :margin 0 5px
80
- :padding 5px 5px 0 5px
81
- :display inline
82
- :font-size 1.1em
78
+ list-style-type: none
79
+ margin: 0 5px
80
+ padding: 5px 5px 0 5px
81
+ display: inline
82
+ font-size: 1.1em
83
83
  // This comment is properly indented
84
- :color #fff
85
- :background #00a4e4
84
+ color: #fff
85
+ background: #00a4e4
86
86
  a:link, a:visited
87
- :color #fff
88
- :text-decoration none
89
- :font-weight bold
87
+ color: #fff
88
+ text-decoration: none
89
+ font-weight: bold
90
90
  a:hover
91
- :text-decoration underline
91
+ text-decoration: underline
92
92
 
93
93
  //General content information
94
94
  #content
95
- :clear both
95
+ clear: both
96
96
  .container
97
- :clear both
97
+ clear: both
98
98
  .column
99
- :float left
99
+ float: left
100
100
  .right
101
- :float right
101
+ float: right
102
102
  a:link, a:visited
103
- :color #93d700
104
- :text-decoration none
103
+ color: #93d700
104
+ text-decoration: none
105
105
  a:hover
106
- :text-decoration underline
106
+ text-decoration: underline
107
107
 
108
108
  // A hard tab:
109
109
 
110
110
 
111
111
  #content
112
112
  p, div
113
- :width 40em
113
+ width: 40em
114
114
  li, dt, dd
115
- :color #ddffdd
116
- :background-color #4792bb
115
+ color: #ddffdd
116
+ background-color: #4792bb
117
117
  .container.video
118
118
  .column.left
119
- :width 200px
119
+ width: 200px
120
120
  .box
121
- :margin-top 10px
121
+ margin-top: 10px
122
122
  p
123
- :margin 0 1em auto 1em
123
+ margin: 0 1em auto 1em
124
124
  .box.participants
125
125
  img
126
- :float left
127
- :margin 0 1em auto 1em
128
- :border 1px solid #6e000d
129
- :style solid
126
+ float: left
127
+ margin: 0 1em auto 1em
128
+ border: 1px solid #6e000d
129
+ style: solid
130
130
  h2
131
- :margin 0 0 10px 0
132
- :padding 0.5em
131
+ margin: 0 0 10px 0
132
+ padding: 0.5em
133
133
  /* The background image is a gif!
134
- :background #6e000d url(/images/hdr_participant.gif) 2px 2px no-repeat
134
+ background: #6e000d url(/images/hdr_participant.gif) 2px 2px no-repeat
135
135
  /* Okay check this out
136
136
  Multiline comments
137
137
  Wow dude
138
138
  I mean seriously, WOW
139
- :text-indent -9999px
139
+ text-indent: -9999px
140
140
  // And also...
141
141
  Multiline comments that don't output!
142
142
  Snazzy, no?
143
- :border
144
- :top
145
- :width 5px
146
- :style solid
147
- :color #a20013
148
- :right
149
- :width 1px
150
- :style dotted
143
+ border:
144
+ top:
145
+ width: 5px
146
+ style: solid
147
+ color: #a20013
148
+ right:
149
+ width: 1px
150
+ style: dotted
151
151
  .column.middle
152
- :width 500px
152
+ width: 500px
153
153
  .column.right
154
- :width 200px
154
+ width: 200px
155
155
  .box
156
- :margin-top 0
156
+ margin-top: 0
157
157
  p
158
- :margin 0 1em auto 1em
158
+ margin: 0 1em auto 1em
159
159
  .column
160
160
  p
161
- :margin-top 0
161
+ margin-top: 0
162
162
 
163
163
  #content.contests
164
164
  .container.information
165
165
  .column.right
166
166
  .box
167
- :margin 1em 0
167
+ margin: 1em 0
168
168
  .box.videos
169
169
  .thumbnail img
170
- :width 200px
171
- :height 150px
172
- :margin-bottom 5px
170
+ width: 200px
171
+ height: 150px
172
+ margin-bottom: 5px
173
173
  a:link, a:visited
174
- :color #93d700
175
- :text-decoration none
174
+ color: #93d700
175
+ text-decoration: none
176
176
  a:hover
177
- :text-decoration underline
177
+ text-decoration: underline
178
178
  .box.votes
179
179
  a
180
- :display block
181
- :width 200px
182
- :height 60px
183
- :margin 15px 0
184
- :background url(/images/btn_votenow.gif) no-repeat
185
- :text-indent -9999px
186
- :outline none
187
- :border none
180
+ display: block
181
+ width: 200px
182
+ height: 60px
183
+ margin: 15px 0
184
+ background: url(/images/btn_votenow.gif) no-repeat
185
+ text-indent: -9999px
186
+ outline: none
187
+ border: none
188
188
  h2
189
- :margin 52px 0 10px 0
190
- :padding 0.5em
191
- :background #6e000d url(/images/hdr_videostats.gif) 2px 2px no-repeat
192
- :text-indent -9999px
193
- :border-top 5px solid #a20013
189
+ margin: 52px 0 10px 0
190
+ padding: 0.5em
191
+ background: #6e000d url(/images/hdr_videostats.gif) 2px 2px no-repeat
192
+ text-indent: -9999px
193
+ border-top: 5px solid #a20013
194
194
 
195
195
  #content.contests
196
196
  .container.video
197
197
  .box.videos
198
198
  h2
199
- :margin 0
200
- :padding 0.5em
201
- :background #6e000d url(/images/hdr_newestclips.gif) 2px 2px no-repeat
202
- :text-indent -9999px
203
- :border-top 5px solid #a20013
199
+ margin: 0
200
+ padding: 0.5em
201
+ background: #6e000d url(/images/hdr_newestclips.gif) 2px 2px no-repeat
202
+ text-indent: -9999px
203
+ border-top: 5px solid #a20013
204
204
  table
205
- :width 100
205
+ width: 100
206
206
  td
207
- :padding 1em
208
- :width 25
209
- :vertical-align top
207
+ padding: 1em
208
+ width: 25
209
+ vertical-align: top
210
210
  p
211
- :margin 0 0 5px 0
211
+ margin: 0 0 5px 0
212
212
  a:link, a:visited
213
- :color #93d700
214
- :text-decoration none
213
+ color: #93d700
214
+ text-decoration: none
215
215
  a:hover
216
- :text-decoration underline
216
+ text-decoration: underline
217
217
  .thumbnail
218
- :float left
218
+ float: left
219
219
  img
220
- :width 80px
221
- :height 60px
222
- :margin 0 10px 0 0
223
- :border 1px solid #6e000d
220
+ width: 80px
221
+ height: 60px
222
+ margin: 0 10px 0 0
223
+ border: 1px solid #6e000d
224
224
 
225
225
  #content
226
226
  .container.comments
227
227
  .column
228
- :margin-top 15px
228
+ margin-top: 15px
229
229
  .column.left
230
- :width 600px
230
+ width: 600px
231
231
  .box
232
232
  ol
233
- :margin 0
234
- :padding 0
233
+ margin: 0
234
+ padding: 0
235
235
  li
236
- :list-style-type none
237
- :padding 10px
238
- :margin 0 0 1em 0
239
- :background #6e000d
240
- :border-top 5px solid #a20013
236
+ list-style-type: none
237
+ padding: 10px
238
+ margin: 0 0 1em 0
239
+ background: #6e000d
240
+ border-top: 5px solid #a20013
241
241
  div
242
- :margin-bottom 1em
242
+ margin-bottom: 1em
243
243
  ul
244
- :text-align right
244
+ text-align: right
245
245
  li
246
- :display inline
247
- :border none
248
- :padding 0
246
+ display: inline
247
+ border: none
248
+ padding: 0
249
249
  .column.right
250
- :width 290px
251
- :padding-left 10px
250
+ width: 290px
251
+ padding-left: 10px
252
252
  h2
253
- :margin 0
254
- :padding 0.5em
255
- :background #6e000d url(/images/hdr_addcomment.gif) 2px 2px no-repeat
256
- :text-indent -9999px
257
- :border-top 5px solid #a20013
253
+ margin: 0
254
+ padding: 0.5em
255
+ background: #6e000d url(/images/hdr_addcomment.gif) 2px 2px no-repeat
256
+ text-indent: -9999px
257
+ border-top: 5px solid #a20013
258
258
  .box
259
259
  textarea
260
- :width 290px
261
- :height 100px
262
- :border none
260
+ width: 290px
261
+ height: 100px
262
+ border: none
263
263
 
264
264
  #footer
265
- :margin-top 10px
266
- :padding 1.2em 1.5em
267
- :background #ff8500
265
+ margin-top: 10px
266
+ padding: 1.2em 1.5em
267
+ background: #ff8500
268
268
  ul
269
- :margin 0
270
- :padding 0
271
- :list-style-type none
269
+ margin: 0
270
+ padding: 0
271
+ list-style-type: none
272
272
  li
273
- :display inline
274
- :margin 0 0.5em
275
- :color #440008
273
+ display: inline
274
+ margin: 0 0.5em
275
+ color: #440008
276
276
  ul.links
277
- :float left
277
+ float: left
278
278
  a:link, a:visited
279
- :color #440008
280
- :text-decoration none
279
+ color: #440008
280
+ text-decoration: none
281
281
  a:hover
282
- :text-decoration underline
282
+ text-decoration: underline
283
283
  ul.copyright
284
- :float right
284
+ float: right
285
285
 
286
286
 
287
287
  .clear
288
- :clear both
288
+ clear: both
289
289
 
290
290
  .centered
291
- :text-align center
291
+ text-align: center
292
292
 
293
293
  img
294
- :border none
294
+ border: none
295
295
 
296
296
  button.short
297
- :width 60px
298
- :height 22px
299
- :padding 0 0 2px 0
300
- :color #fff
301
- :border none
302
- :background url(/images/btn_short.gif) no-repeat
297
+ width: 60px
298
+ height: 22px
299
+ padding: 0 0 2px 0
300
+ color: #fff
301
+ border: none
302
+ background: url(/images/btn_short.gif) no-repeat
303
303
 
304
304
  table
305
- :border-collapse collapse
305
+ border-collapse: collapse