From ad28be036ed850ce9c135d28b356f39b210adc9f Mon Sep 17 00:00:00 2001 From: Jeremy Prevost Date: Thu, 2 Oct 2014 16:40:59 -0500 Subject: [PATCH] Updating gems - bootstrap-sass required some tweaks --- Gemfile | 1 + Gemfile.lock | 65 ++++++++++--------- app/assets/javascripts/application.js | 2 +- .../{application.css => application.css.scss} | 4 +- 4 files changed, 40 insertions(+), 32 deletions(-) rename app/assets/stylesheets/{application.css => application.css.scss} (91%) diff --git a/Gemfile b/Gemfile index 613675a..c2d2c96 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gem 'rails', '4.1.4' gem 'nokogiri' gem 'newrelic_rpm' gem 'bootstrap-sass', '~> 3.2.0' +gem 'autoprefixer-rails' gem 'coveralls', require: false group :development do diff --git a/Gemfile.lock b/Gemfile.lock index d453163..4542dcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,20 +29,23 @@ GEM tzinfo (~> 1.1) addressable (2.3.6) arel (5.0.1.20140414130214) - bootstrap-sass (3.2.0.0) + autoprefixer-rails (3.1.0.20140911) + execjs + bootstrap-sass (3.2.0.2) sass (~> 3.2) builder (3.2.2) - byebug (3.1.2) + byebug (3.5.1) columnize (~> 0.8) debugger-linecache (~> 1.2) - capybara (2.4.1) + slop (~> 3.6) + capybara (2.4.3) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) columnize (0.8.9) - coveralls (0.7.0) + coveralls (0.7.1) multi_json (~> 1.3) rest-client simplecov (>= 0.7) @@ -57,7 +60,7 @@ GEM execjs (2.2.1) hike (1.2.3) i18n (0.6.11) - jquery-rails (3.1.1) + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -66,11 +69,11 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.6.0) - minitest (5.4.0) + minitest (5.4.2) multi_json (1.10.1) netrc (0.7.7) - newrelic_rpm (3.9.0.229) - nokogiri (1.6.2.1) + newrelic_rpm (3.9.5.251) + nokogiri (1.6.3.1) mini_portile (= 0.6.0) pg (0.17.1) polyglot (0.3.5) @@ -98,37 +101,38 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) - rest-client (1.7.1) + rest-client (1.7.2) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec-core (3.0.2) - rspec-support (~> 3.0.0) - rspec-expectations (3.0.2) + rspec-core (3.1.5) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.0.0) - rspec-mocks (3.0.2) - rspec-support (~> 3.0.0) - rspec-rails (3.0.1) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.2) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.0.0) - rspec-expectations (~> 3.0.0) - rspec-mocks (~> 3.0.0) - rspec-support (~> 3.0.0) - rspec-support (3.0.2) - safe_yaml (1.0.3) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.1) + safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - simplecov (0.8.2) + simplecov (0.9.1) docile (~> 1.1.0) - multi_json + multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) + slop (3.6.0) spring (1.1.3) spring-commands-rspec (1.0.2) spring (>= 0.9.1) @@ -137,7 +141,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.1.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -147,17 +151,17 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.3.0) + tins (1.3.3) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (1.2.1) + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.1) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) - vcr (2.9.2) - webmock (1.18.0) + vcr (2.9.3) + webmock (1.19.0) addressable (>= 2.3.6) crack (>= 0.3.2) xpath (2.0.0) @@ -167,6 +171,7 @@ PLATFORMS ruby DEPENDENCIES + autoprefixer-rails bootstrap-sass (~> 3.2.0) byebug capybara diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8c515ad..920e0cf 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,5 @@ // //= require jquery //= require jquery_ujs -//= require bootstrap +//= require bootstrap-sprockets //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss similarity index 91% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.scss index 62a5c86..9180ef0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss @@ -9,6 +9,8 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - *= require bootstrap *= require_tree . */ + +@import "bootstrap-sprockets"; +@import "bootstrap";