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

parallel · Aug 1, 2011 · 7937bd6 · 7937bd6
2 parents bfe6f8f + fc20bd9
commit 7937bd6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/bin/stylus b/bin/stylus
@@ -484,9 +484,9 @@ function watch(file, fn) {
  */
 
 function watchImports(file, imports) {
-  imports.forEach(function(import){
-    if (!import.path) return;
-    watch(import.path, function(){
+  imports.forEach(function(imported){
+    if (!imported.path) return;
+    watch(imported.path, function(){
       compileFile(file);
     });
   });

diff --git a/docs/selectors.md b/docs/selectors.md
@@ -1,4 +1,3 @@
-
 ## Selectors
 
 ### Indentation
@@ -98,7 +97,7 @@ yielding:
       html.ie8 body #login,
       html.ie7 body #login,
       html.ie6 body #login {
-        border: 1px solid #eee;
+        border: 2px solid #eee;
       }
 
 ### Disambiguation

diff --git a/examples/images.styl b/examples/images.styl
@@ -5,6 +5,9 @@ body
 #wrapper
   background url(/images/gopher.jpg)
 
+#footer
+  background url(/images/gradient.svg)
+
 .sprite
   // both work due to the additional paths option
   // passed to stylus.url()

diff --git a/examples/images/gradient.svg b/examples/images/gradient.svg
diff --git a/lib/functions/url.js b/lib/functions/url.js
@@ -25,6 +25,7 @@ var mimes = {
   , '.png': 'image/png'
   , '.jpg': 'image/jpeg'
   , '.jpeg': 'image/jpeg'
+  , '.svg': 'image/svg+xml'
 };
 
 /**