diff --git a/Gemfile b/Gemfile index cf9bb59..d10e396 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ group :assets do end # bootstrap in sass in rails -gem 'bootstrap-sass', '~> 3.1.1.1' +gem 'bootstrap-sass', '~> 3.4.1' # replaces glyphicons gem 'font-awesome-rails' diff --git a/Gemfile.lock b/Gemfile.lock index fbd6e56..7500f24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,13 +34,16 @@ GEM arel (3.0.3) auto_strip_attributes (2.1.0) activerecord (>= 3.0) + autoprefixer-rails (9.7.4) + execjs better_errors (1.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.1.1.1) - sass (~> 3.2) + bootstrap-sass (3.4.1) + autoprefixer-rails (>= 5.2.1) + sassc (>= 2.0.0) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) builder (3.0.4) @@ -98,6 +101,7 @@ GEM multi_json (~> 1.0) faraday (0.15.2) multipart-post (>= 1.2, < 3) + ffi (1.12.2) font-awesome-rails (4.0.3.2) railties (>= 3.2, < 5.0) grit (2.5.0) @@ -217,6 +221,9 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) rdoc (3.12.2) json (~> 1.4) rest-client (2.0.1) @@ -226,11 +233,17 @@ GEM rinku (1.7.2) rmagick (2.13.2) ruby-openid (2.7.0) - sass (3.2.1) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sassc (2.2.1) + ffi (~> 1.9) slop (3.6.0) sprockets (2.2.3) hike (~> 1.2) @@ -269,7 +282,7 @@ DEPENDENCIES auto_strip_attributes (~> 2.0) better_errors binding_of_caller - bootstrap-sass (~> 3.1.1.1) + bootstrap-sass (~> 3.4.1) bootstrap-wysihtml5-rails capatross! capistrano