diff --git a/Gemfile b/Gemfile index d739aa5..5b435ea 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ group :assets do gem 'coffee-rails', '~> 3.2.1' gem 'jquery-ui-rails' # files for bootstrap-in-asset-pipeline integration - gem 'bootstrap-sass', '~> 3.1.1.1' + gem 'bootstrap-sass', '~> 3.4.1' # extension's packaging of html5shiv for the asset pipeline gem 'extension-html5shiv-rails', :require => 'html5shiv-rails', :source => 'https://engineering.extension.org/rubygems/' # replaces glyphicons diff --git a/Gemfile.lock b/Gemfile.lock index 2a985a9..1a90e7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,14 +34,17 @@ GEM arel (3.0.3) auto_strip_attributes (2.0.4) activerecord (>= 3.0) + autoprefixer-rails (9.7.1) + execjs bcrypt-ruby (3.0.1) better_errors (1.0.1) 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) breadcrumbs_on_rails (2.3.0) builder (3.0.4) callsite (0.0.11) @@ -86,6 +89,7 @@ GEM extension-html5shiv-rails (3.6.2.1) faraday (0.13.1) multipart-post (>= 1.2, < 3) + ffi (1.11.1) font-awesome-rails (4.0.3.1) railties (>= 3.2, < 5.0) geocoder (1.1.8) @@ -226,6 +230,9 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (11.3.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) rdoc (3.12.2) json (~> 1.4) redis (3.0.4) @@ -265,11 +272,17 @@ GEM ruby-openid (2.7.0) safe_attributes (1.0.10) activerecord (>= 3.0.0) - sass (3.2.12) + 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.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sassc (2.2.1) + ffi (~> 1.9) select2-rails (3.5.9.3) thor (~> 0.14) sidekiq (2.14.0) @@ -330,7 +343,7 @@ DEPENDENCIES bcrypt-ruby (~> 3.0.0) better_errors binding_of_caller - bootstrap-sass (~> 3.1.1.1) + bootstrap-sass (~> 3.4.1) breadcrumbs_on_rails capatross capistrano (~> 2.15.5)