sass 3.1.0.alpha.27 → 3.1.0.alpha.28

Sign up to get free protection for your applications and to get access to all the features.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.0.alpha.27
1
+ 3.1.0.alpha.28
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.0.alpha.27
1
+ 3.1.0.alpha.28
@@ -60,6 +60,9 @@ module Sass::Tree
60
60
  new_rule = parent.dup
61
61
  new_rule.children = self.children
62
62
  self.children = Array(new_rule.cssize(extends, self))
63
+ # If the last child is actually the end of the group,
64
+ # the parent's cssize will set it properly
65
+ self.children.last.group_end = false unless self.children.empty?
63
66
  end
64
67
 
65
68
  # @see Node#to_s
@@ -2374,7 +2374,19 @@ SASS
2374
2374
  end
2375
2375
 
2376
2376
  def test_nested_media_around_properties
2377
- sass_str = <<SASS
2377
+ assert_equal <<CSS, render(<<SASS)
2378
+ .outside {
2379
+ color: red;
2380
+ background: blue; }
2381
+ @media print {
2382
+ .outside {
2383
+ color: black; } }
2384
+ @media print and nested {
2385
+ .outside .inside {
2386
+ border: 1px solid black; } }
2387
+ .outside .middle {
2388
+ display: block; }
2389
+ CSS
2378
2390
  .outside
2379
2391
  color: red
2380
2392
  @media print
@@ -2386,24 +2398,6 @@ SASS
2386
2398
  .middle
2387
2399
  display: block
2388
2400
  SASS
2389
- css_str = <<CSS
2390
- .outside {
2391
- color: red; }
2392
-
2393
- @media print {
2394
- .outside {
2395
- color: black; } }
2396
-
2397
- @media (print) and (nested) {
2398
- .outside .inside {
2399
- border: 1px solid black; } }
2400
-
2401
- .outside {
2402
- background: blue; }
2403
- .outside .middle {
2404
- display: block; }
2405
- CSS
2406
- assert_equal css_str, render(sass_str)
2407
2401
  end
2408
2402
 
2409
2403
  def test_media_with_parent_references
@@ -1175,60 +1175,4 @@ b {
1175
1175
  SCSS
1176
1176
 
1177
1177
  end
1178
- def test_nested_media_around_properties
1179
- scss_str = <<SCSS
1180
- .outside {
1181
- color: red;
1182
- @media print {
1183
- color: black;
1184
- .inside {
1185
- @media nested {
1186
- border: 1px solid black;
1187
- }
1188
- }
1189
- }
1190
- background: blue;
1191
- .middle {
1192
- display: block;
1193
- }
1194
- }
1195
- SCSS
1196
- css_str = <<CSS
1197
- .outside {
1198
- color: red; }
1199
-
1200
- @media print {
1201
- .outside {
1202
- color: black; } }
1203
-
1204
- @media (print) and (nested) {
1205
- .outside .inside {
1206
- border: 1px solid black; } }
1207
-
1208
- .outside {
1209
- background: blue; }
1210
- .outside .middle {
1211
- display: block; }
1212
- CSS
1213
- assert_equal css_str, render(scss_str)
1214
- end
1215
-
1216
- def test_media_with_parent_references
1217
- scss_str = <<SCSS
1218
- .outside {
1219
- @media print {
1220
- &.inside {
1221
- border: 1px solid black;
1222
- }
1223
- }
1224
- }
1225
- SCSS
1226
- css_str = <<CSS
1227
- @media print {
1228
- .outside.inside {
1229
- border: 1px solid black; } }
1230
- CSS
1231
- assert_equal css_str, render(scss_str)
1232
- end
1233
-
1234
1178
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.alpha.27
4
+ version: 3.1.0.alpha.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum