Update bootstrap-sass gem.

studiospring · Sep 23, 2015 · c476f2f · c476f2f
1 parent ba8c127
commit c476f2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,7 @@ end
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails'
 # Put this outside assets group, or heroku will complain
-gem 'bootstrap-sass', '~>3.0.3.0'
+gem 'bootstrap-sass'
 gem 'sass-rails'
 
 gem 'responders'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -49,9 +49,13 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
+    autoprefixer-rails (6.0.3)
+      execjs
+      json
     bcrypt (3.1.10)
-    bootstrap-sass (3.0.3.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     builder (3.2.2)
     byebug (6.0.2)
     capybara (2.5.0)
@@ -277,7 +281,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass (~> 3.0.3.0)
+  bootstrap-sass
   byebug
   capybara
   childprocess

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -15,6 +15,7 @@
 $font-family-sans-serif:  Herculanum, "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 /*bootstrap standard colour - primary buttons etc*/
 $brand-primary:         #1A3771 !default;
+@import "bootstrap-sprockets";
 @import "bootstrap";
 /*Sansation - freeware font family*/
 /*Version 1.3*/