Merge pull request stylus#891 from tonistiigi/619-slash-in-media

Fixes stylus#619 stylus#888 Support slash in media
mcfog · Nov 20, 2012 · c4014ee · c4014ee
2 parents 8ef59a0 + c20cc71
commit c4014ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/lib/lexer.js b/lib/lexer.js
@@ -456,7 +456,7 @@ Lexer.prototype = {
 
   media: function() {
     var captures;
-    if (captures = /^@media[ \t]*([^\/{\n]+)/.exec(this.str)) {
+    if (captures = /^@media[ \t]*(.+?)(?=\/\/|[\n{])/.exec(this.str)) {
       this.skip(captures);
       return new Token('media', captures[1].trim());
     }

diff --git a/test/cases/regression.619.css b/test/cases/regression.619.css
@@ -0,0 +1,5 @@
+@media only screen and (-o-min-device-pixel-ratio: 3/2) {
+  body {
+    font-size: 66%;
+  }
+}
diff --git a/test/cases/regression.619.styl b/test/cases/regression.619.styl
@@ -0,0 +1,3 @@
+@media only screen and (-o-min-device-pixel-ratio: 3/2)
+  body
+    font-size 66%