Merge pull request #92 from tdumitrescu/css-fixes

Fixes for CSS double-includes / override behavior, Thanks @tdumitrescu
scotch · Nov 30, 2013 · 288f021 · 288f021
2 parents b0334f2 + 19810b8
commit 288f021
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/styles/app.less b/app/styles/app.less
@@ -23,7 +23,7 @@
 @import "/bower_components/bootstrap-less-themes/themes/sapling/variables.less";
 
 // Your custom theme
-@import "_variables.less";
+@import "overrides/_variables.less";
 
 // Core variables and mixins
 @import "/bower_components/bootstrap-less/less/mixins.less";
@@ -100,4 +100,4 @@
 @import "/bower_components/bootstrap-less-themes/themes/sapling/overrides.less";
 
 // Your custom theme
-@import "_overrides.less";
+@import "overrides/_overrides.less";
diff --git a/app/styles/_overrides.less → app/styles/overrides/_overrides.less b/app/styles/_overrides.less → app/styles/overrides/_overrides.less
diff --git a/app/styles/_variables.less → app/styles/overrides/_variables.less b/app/styles/_variables.less → app/styles/overrides/_variables.less
diff --git a/config.coffee b/config.coffee
@@ -1,7 +1,8 @@
 exports.config =
   # See docs at http://brunch.readthedocs.org/en/latest/config.html.
   conventions:
-    assets: /^app\/assets\//
+    assets:  /^app\/assets\//
+    ignored: /^(bower_components\/bootstrap-less(-themes)?|app\/styles\/overrides)/
   modules:
     definition: false
     wrapper: false