Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move bootstrap variables customization scss to webpack assets dir; Co…
…nfigure asset pipeline's search patch to include webpack/assets/stylesheets
  • Loading branch information
mbreining committed Dec 5, 2014
commit 09efcf9cbc5ab42333a9320fc5b11633471b6ce4
9 changes: 7 additions & 2 deletions app/assets/stylesheets/_bootstrap-custom.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Customizations
@import "bootstrap-variables-customization";

// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";
Expand Down Expand Up @@ -28,10 +31,10 @@
@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
//@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
//@import "bootstrap/progress-bars";
@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
Expand All @@ -48,3 +51,5 @@
// Utility classes
@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";

//@import "bootstrap-style-customizations";
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "../../../webpack/assets/stylesheets/test-stylesheet";
@import "../../../webpack/assets/stylesheets/test-sass-stylesheet";

@import "bootstrap-sprockets";
@import "bootstrap-custom";
3 changes: 3 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ class Application < Rails::Application

# For not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true

# Add webpack/assets/stylesheets to asset pipeline's search path.
config.assets.paths << Rails.root.join("webpack", "assets" ,"stylesheets")
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$navbar-default-bg: #FFFFE0;