diff --git a/Gemfile b/Gemfile index 0581c09..f95627f 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'bootstrap-sass', '~> 3.3.6' +gem 'bootstrap', '~> 4.0.0.alpha6' gem 'coffee-rails', '~> 4.2' gem 'devise' gem 'jbuilder', '~> 2.5' diff --git a/Gemfile.lock b/Gemfile.lock index 45aeb54..b45abdb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,16 +42,16 @@ GEM public_suffix (~> 2.0, >= 2.0.2) arel (7.1.4) ast (2.3.0) - autoprefixer-rails (6.7.0) + autoprefixer-rails (6.6.1) execjs axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) bcrypt (3.1.11) - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + bootstrap (4.0.0.alpha6) + autoprefixer-rails (>= 6.0.3) + sass (>= 3.4.19) builder (3.2.3) byebug (9.0.6) capybara (2.11.0) @@ -305,7 +305,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 3.3.6) + bootstrap (~> 4.0.0.alpha6) byebug capybara coffee-rails (~> 4.2) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b12018d..3009bd1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,7 @@ // about supported directives. // //= require jquery +//= require bootstrap //= require jquery_ujs //= require turbolinks //= require_tree . diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8c26f8c..cbd46a7 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,7 +1 @@ -/* - *= require_tree . - *= require_self - */ - -@import "bootstrap-sprockets"; @import "bootstrap";