From 87b8f2bf41530a4db838a817aac55bd41d2a9d50 Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Tue, 22 Dec 2015 01:10:26 -0800 Subject: [PATCH] Remove bootstrap-sass. Comes from NPM. --- Gemfile | 1 - Gemfile.lock | 4 ---- client/webpack.client.rails.build.config.js | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9633ddb0c..e95b5c361 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ end # Use SCSS for stylesheets gem "sass-rails" -gem "bootstrap-sass", "~> 3.3" # Use Uglifier as compressor for JavaScript assets gem "uglifier" # Use CoffeeScript for .js.coffee assets and views diff --git a/Gemfile.lock b/Gemfile.lock index 6462b0b40..e2f298eb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,9 +49,6 @@ GEM awesome_print (1.6.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) brakeman (3.1.3) erubis (~> 2.6) fastercsv (~> 1.5) @@ -325,7 +322,6 @@ PLATFORMS DEPENDENCIES autoprefixer-rails awesome_print - bootstrap-sass (~> 3.3) brakeman bundler-audit capybara diff --git a/client/webpack.client.rails.build.config.js b/client/webpack.client.rails.build.config.js index 5dfdc0b93..bdb041ae6 100644 --- a/client/webpack.client.rails.build.config.js +++ b/client/webpack.client.rails.build.config.js @@ -19,6 +19,8 @@ config.entry.vendor.unshift( 'es5-shim/es5-shim', 'es5-shim/es5-sham', 'jquery-ujs', + + // Configures extractStyles to be true if NODE_ENV is production 'bootstrap-loader/extractStyles' );