From 04ae29006092a6efde579e2bfbb53a331d4e0755 Mon Sep 17 00:00:00 2001 From: t ddddddd Date: Sat, 30 Nov 2013 10:09:52 -0800 Subject: [PATCH 1/2] make brunch ignore bower_components/bootstrap-less + bootstrap-less-themes --- config.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.coffee b/config.coffee index 6d112f9..7359227 100644 --- 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)?/ modules: definition: false wrapper: false From 19810b8c96ee643bf58c5818f55c2f96a0b63e6d Mon Sep 17 00:00:00 2001 From: t ddddddd Date: Sat, 30 Nov 2013 10:15:48 -0800 Subject: [PATCH 2/2] Brunch-ignore custom stylesheet overrides because they're imported already by app.less; otherwise they get packaged twice into app.css. --- app/styles/app.less | 4 ++-- app/styles/{ => overrides}/_overrides.less | 0 app/styles/{ => overrides}/_variables.less | 0 config.coffee | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename app/styles/{ => overrides}/_overrides.less (100%) rename app/styles/{ => overrides}/_variables.less (100%) diff --git a/app/styles/app.less b/app/styles/app.less index 32519d5..b60d5db 100644 --- 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 b/app/styles/overrides/_overrides.less similarity index 100% rename from app/styles/_overrides.less rename to app/styles/overrides/_overrides.less diff --git a/app/styles/_variables.less b/app/styles/overrides/_variables.less similarity index 100% rename from app/styles/_variables.less rename to app/styles/overrides/_variables.less diff --git a/config.coffee b/config.coffee index 7359227..66535da 100644 --- a/config.coffee +++ b/config.coffee @@ -2,7 +2,7 @@ exports.config = # See docs at http://brunch.readthedocs.org/en/latest/config.html. conventions: assets: /^app\/assets\// - ignored: /^bower_components\/bootstrap-less(-themes)?/ + ignored: /^(bower_components\/bootstrap-less(-themes)?|app\/styles\/overrides)/ modules: definition: false wrapper: false