sass 3.1.0.alpha.26 → 3.1.0.alpha.27

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.26
+3.1.0.alpha.27

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.26
+3.1.0.alpha.27

data/test/sass/engine_test.rb

@@ -2373,6 +2373,54 @@ CSS
 SASS
   end
 
+  def test_nested_media_around_properties
+    sass_str = <<SASS
+.outside
+  color: red
+  @media print
+    color: black
+    .inside
+      @media nested
+        border: 1px solid black
+  background: blue
+  .middle
+    display: block
+SASS
+    css_str = <<CSS
+.outside {
+  color: red; }
+
+@media print {
+  .outside {
+    color: black; } }
+
+@media (print) and (nested) {
+  .outside .inside {
+    border: 1px solid black; } }
+
+.outside {
+  background: blue; }
+  .outside .middle {
+    display: block; }
+CSS
+    assert_equal css_str, render(sass_str)
+  end
+
+  def test_media_with_parent_references
+    sass_str = <<SASS
+.outside
+  @media print
+    &.inside
+      border: 1px solid black
+SASS
+    css_str = <<CSS
+@media print {
+  .outside.inside {
+    border: 1px solid black; } }
+CSS
+    assert_equal css_str, render(sass_str)
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?

data/test/sass/scss/scss_test.rb

@@ -1175,4 +1175,60 @@ b {
 SCSS
 
   end
+  def test_nested_media_around_properties
+    scss_str = <<SCSS
+.outside {
+  color: red;
+  @media print {
+    color: black;
+    .inside {
+      @media nested {
+        border: 1px solid black;
+      }
+    }
+  }
+  background: blue;
+  .middle {
+    display: block;
+  }
+}
+SCSS
+    css_str = <<CSS
+.outside {
+  color: red; }
+
+@media print {
+  .outside {
+    color: black; } }
+
+@media (print) and (nested) {
+  .outside .inside {
+    border: 1px solid black; } }
+
+.outside {
+  background: blue; }
+  .outside .middle {
+    display: block; }
+CSS
+    assert_equal css_str, render(scss_str)
+  end
+
+  def test_media_with_parent_references
+    scss_str = <<SCSS
+.outside {
+  @media print {
+    &.inside {
+      border: 1px solid black;
+    }
+  }
+}
+SCSS
+    css_str = <<CSS
+@media print {
+  .outside.inside {
+    border: 1px solid black; } }
+CSS
+    assert_equal css_str, render(scss_str)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.26
+  version: 3.1.0.alpha.27
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -05:00
+date: 2010-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency