Skip to content

Commit 21de239

Browse files
committed
Merge pull request #186 from shakacode/remove-bootstrap-sass-gem
Remove bootstrap-sass. Comes from NPM.
2 parents 814671d + 87b8f2b commit 21de239

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ end
1717

1818
# Use SCSS for stylesheets
1919
gem "sass-rails"
20-
gem "bootstrap-sass", "~> 3.3"
2120
# Use Uglifier as compressor for JavaScript assets
2221
gem "uglifier"
2322
# Use CoffeeScript for .js.coffee assets and views

Gemfile.lock

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ GEM
4949
awesome_print (1.6.1)
5050
binding_of_caller (0.7.2)
5151
debug_inspector (>= 0.0.1)
52-
bootstrap-sass (3.3.6)
53-
autoprefixer-rails (>= 5.2.1)
54-
sass (>= 3.3.4)
5552
brakeman (3.1.3)
5653
erubis (~> 2.6)
5754
fastercsv (~> 1.5)
@@ -325,7 +322,6 @@ PLATFORMS
325322
DEPENDENCIES
326323
autoprefixer-rails
327324
awesome_print
328-
bootstrap-sass (~> 3.3)
329325
brakeman
330326
bundler-audit
331327
capybara

client/webpack.client.rails.build.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ config.entry.vendor.unshift(
1919
'es5-shim/es5-shim',
2020
'es5-shim/es5-sham',
2121
'jquery-ujs',
22+
23+
// Configures extractStyles to be true if NODE_ENV is production
2224
'bootstrap-loader/extractStyles'
2325
);
2426

0 commit comments

Comments
 (0)