diff --git a/spec/features/new_project_spec.rb b/spec/features/new_project_spec.rb index c9fcb2518..094768522 100644 --- a/spec/features/new_project_spec.rb +++ b/spec/features/new_project_spec.rb @@ -272,7 +272,7 @@ def app_name expect(read_project_file(flashes_path)).to match(/\$flashes/m) app_css = read_project_file(%w(app assets stylesheets application.scss)) - expect(app_css).to match(/normalize-rails.*bourbon.*neat.*base.*refills/m) + expect(app_css).to match(/normalize-css.*bourbon.*neat.*base.*refills/m) end it "doesn't use turbolinks" do diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index 88a734717..72c98d169 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -7,11 +7,11 @@ gem "delayed_job_active_record" gem "flutie" gem "honeybadger" gem "jquery-rails" -gem "normalize-rails", "~> 3.0.0" gem "pg" gem "puma" gem "rack-canonical-host" gem "rails", "<%= Suspenders::RAILS_VERSION %>" +gem "rails-assets-normalize-css", source: "https://rails-assets.org" gem "recipient_interceptor" gem "sass-rails", "~> 5.0" gem "simple_form" diff --git a/templates/application.scss b/templates/application.scss index 53a8c66de..4a1dd47a3 100644 --- a/templates/application.scss +++ b/templates/application.scss @@ -1,6 +1,6 @@ @charset "utf-8"; -@import "normalize-rails"; +@import "normalize-css"; @import "bourbon"; @import "neat";