Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for CSS double-includes / override behavior #92

Merged
merged 2 commits into from
Nov 30, 2013
Merged

Fixes for CSS double-includes / override behavior #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ae290
make brunch ignore bower_components/bootstrap-less + bootstrap-less-t…
tdumitrescu Nov 30, 2013
19810b8
Brunch-ignore custom stylesheet overrides because they're imported al…
tdumitrescu Nov 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/styles/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -100,4 +100,4 @@
@import "/bower_components/bootstrap-less-themes/themes/sapling/overrides.less";

// Your custom theme
@import "_overrides.less";
@import "overrides/_overrides.less";
0 app/styles/_overrides.less → app/styles/overrides/_overrides.less
View file
Open in desktop
File renamed without changes.
0 app/styles/_variables.less → app/styles/overrides/_variables.less
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion config.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down