Merge branch 'master' of github.com:LearnBoost/stylus

isaacs · Sep 26, 2011 · b760e1d · b760e1d
2 parents 3cb18d0 + 70c3783
commit b760e1d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/bin/stylus b/bin/stylus
@@ -134,7 +134,7 @@ while (args.length) {
   switch (arg) {
     case '-h':
     case '--help':
-      console.log(usage);
+      console.error(usage);
       process.exit(1);
     case '-d':
     case '--compare':

diff --git a/lib/lexer.js b/lib/lexer.js
@@ -435,7 +435,7 @@ Lexer.prototype = {
 
   media: function() {
     var captures;
-    if (captures = /^@media *([^{\n]+)/.exec(this.str)) {
+    if (captures = /^@media *([^\/{\n]+)/.exec(this.str)) {
       this.skip(captures);
       return new Token('media', captures[1].trim());
     }

diff --git a/test/cases/regression.415.css b/test/cases/regression.415.css
@@ -0,0 +1,5 @@
+@media screen and (min-width: 481px) {
+  #test {
+    display: none;
+  }
+}
diff --git a/test/cases/regression.415.styl b/test/cases/regression.415.styl
@@ -0,0 +1,3 @@
+@media screen and (min-width: 481px) //asdasdasd
+  #test
+    display none