6362: Update bootstrap gem.

See https://github.com/twbs/bootstrap-sass/issues/653

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index e35cc83ece303aec8b84c4e43e9a15f0258ba7d4..9c874e2b6f6acd5f3df07663b7153ed9a8eaf870 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -53,7 +53,8 @@ group :test, :performance do
 end
 
 gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 3.1.0'
+gem 'sprockets-rails'
+gem 'bootstrap-sass', '~> 3.3.0'
 gem 'bootstrap-x-editable-rails'
 gem 'bootstrap-tab-history-rails'
 

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index bc7ddaf7eda77c9a53df1a5c7e5839319b423042..5994359b8efdda71f224ee50a4730272eeff64fe 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -51,8 +51,12 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
+    autoprefixer-rails (5.2.1)
+      execjs
+      json
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     bootstrap-tab-history-rails (0.1.0)
       railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
@@ -256,7 +260,7 @@ DEPENDENCIES
   andand
   angularjs-rails
   arvados (>= 0.1.20150511150219)
-  bootstrap-sass (~> 3.1.0)
+  bootstrap-sass (~> 3.3.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails
   byebug
@@ -289,6 +293,7 @@ DEPENDENCIES
   selenium-webdriver
   simplecov (~> 0.7)
   simplecov-rcov
+  sprockets-rails
   sshkey
   themes_for_rails!
   therubyracer

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 9560bb7dc86662a12d49672254205d2ef890508c..bab72893bd921dc2f6b330d6a2e2277d1e817243 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -7,14 +7,15 @@
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require bootstrap
- *= require bootstrap3-editable/bootstrap-editable
- *= require morris
- *= require_tree .
  */
 
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+@import 'bootstrap3-editable/bootstrap-editable';
+
+//= require morris
+//= require_tree .
+
 .contain-align-left {
     text-align: left;
 }