diff --git a/Gemfile b/Gemfile index 98913b0a..92ccf11a 100644 --- a/Gemfile +++ b/Gemfile @@ -43,6 +43,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", "3.3.3" + group :development do gem "spring" gem "spring-commands-cucumber" diff --git a/Gemfile.lock b/Gemfile.lock index aafd4049..837cdabb 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) @@ -228,6 +234,7 @@ DEPENDENCIES acts_as_list aruba (>= 0.5.4) bcrypt (~> 3.1.7) + bootstrap-sass (= 3.3.3) bullet capybara codeclimate-test-reporter 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 971df467..2931b8d0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss @@ -14,3 +14,8 @@ *= require_tree ../../../vendor/assets/stylesheets *= require tracks */ + +.bootstrap { + @import "bootstrap-sprockets"; + @import "bootstrap"; +}