From 565d4ac1a157432b25181a8b795bee2d07a45177 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Fri, 7 Aug 2015 23:15:30 -0400 Subject: [PATCH 1/4] add in bootstrap-sass --- Gemfile | 2 ++ Gemfile.lock | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index 5b07e9c7..45dcc7e5 100644 --- a/Gemfile +++ b/Gemfile @@ -42,6 +42,8 @@ gem 'bcrypt', '~> 3.1.7' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 1.2' +gem "bootstrap-sass" + group :development do gem "spring" gem "spring-commands-cucumber" diff --git a/Gemfile.lock b/Gemfile.lock index 909d1115..1864d181 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,7 +39,13 @@ GEM childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) + autoprefixer-rails (5.1.0) + execjs + json bcrypt (3.1.9) + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) builder (3.2.2) bullet (4.14.0) activesupport (>= 3.0.0) @@ -217,6 +223,7 @@ DEPENDENCIES acts_as_list aruba (>= 0.5.4) bcrypt (~> 3.1.7) + bootstrap-sass bullet capybara codeclimate-test-reporter From a896576b70793c44ae75fc80a76d471c4d730fe4 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Fri, 7 Aug 2015 23:16:11 -0400 Subject: [PATCH 2/4] Make application.css a SASS file This is so we can use SASS import directives in it. --- app/assets/stylesheets/{application.css => application.css.scss} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/assets/stylesheets/{application.css => application.css.scss} (100%) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss similarity index 100% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.scss From 212dd695147077b6aa75da9beb4c559a5bf82e43 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Fri, 7 Aug 2015 23:29:40 -0400 Subject: [PATCH 3/4] Add the ability to conditionally use bootstrap Elements should be wrapped in the bootstrap class to use this feature --- app/assets/stylesheets/application.css.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 971df467..2931b8d0 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -14,3 +14,8 @@ *= require_tree ../../../vendor/assets/stylesheets *= require tracks */ + +.bootstrap { + @import "bootstrap-sprockets"; + @import "bootstrap"; +} From f62dfac1e47659953de8b42182b08bd4256a8ded Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Thu, 20 Aug 2015 22:03:44 -0500 Subject: [PATCH 4/4] Lock bootstrap-sass to to 3.3.3 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 45dcc7e5..cd201d52 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'bcrypt', '~> 3.1.7' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 1.2' -gem "bootstrap-sass" +gem "bootstrap-sass", "3.3.3" group :development do gem "spring" diff --git a/Gemfile.lock b/Gemfile.lock index 1864d181..c1dca6b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -223,7 +223,7 @@ DEPENDENCIES acts_as_list aruba (>= 0.5.4) bcrypt (~> 3.1.7) - bootstrap-sass + bootstrap-sass (= 3.3.3) bullet capybara codeclimate-test-reporter