added @media bubbling (similar to SASS)

mrcljx · Feb 14, 2012 · 288248d · 288248d
1 parent d17a461
commit 288248d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/lib/less/tree/directive.js b/lib/less/tree/directive.js
@@ -1,11 +1,14 @@
 (function (tree) {
 
 tree.Directive = function (name, value, features) {
+    var selectors;
+
     this.name = name;
     this.features = features && new(tree.Value)(features);
 
     if (Array.isArray(value)) {
-        this.ruleset = new(tree.Ruleset)([], value);
+        selectors = name === '@media' ? [new(tree.Selector)([new(tree.Element)("", null, 0)])] : [];
+        this.ruleset = new(tree.Ruleset)(selectors, value);
         this.ruleset.allowImports = true;
     } else {
         this.value = value;
@@ -16,7 +19,7 @@ tree.Directive.prototype = {
         var features = this.features ? ' ' + this.features.toCSS(env) : '';
 
         if (this.ruleset) {
-            this.ruleset.root = true;
+            this.ruleset.root = ctx.length === 0 || (this.name !== '@media');
             return this.name + features + (env.compress ? '{' : ' {\n  ') +
                    this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n  ') +
                                (env.compress ? '}': '\n}\n');

diff --git a/test/css/media.css b/test/css/media.css
@@ -25,3 +25,8 @@
     max-width: 480px;
   }
 }
+@media print {
+  body {
+    padding: 20px;
+  }
+}
diff --git a/test/less/media.less b/test/less/media.less
@@ -5,7 +5,7 @@
 
 @media print {
     .class {
-        color: blue;    
+        color: blue;
         .sub {
             width: @var;
         }
@@ -29,3 +29,9 @@
         max-width: 480px;
     }
 }
+
+body {
+  @media print {
+    padding: 20px;
+  }
+}