Skip to content

Commit

Permalink
Install normalize.css via yarn (#851)
Browse files Browse the repository at this point in the history
Removes normalizes from rails assets
  • Loading branch information
delphaber authored and nickcharlton committed Jul 7, 2017
1 parent 8c39efc commit 3fbdc34
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions lib/suspenders/generators/stylesheet_base_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,9 @@ def install_refills
def install_bitters
run "bitters install --path app/assets/stylesheets"
end

def install_normalize_css
run "bin/yarn add normalize.css"
end
end
end
4 changes: 3 additions & 1 deletion spec/features/new_project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ 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-css.*bourbon.*neat.*base.*refills/m)
expect(app_css).to match(
/normalize\.css\/normalize\.css.*bourbon.*neat.*base.*refills/m,
)
end

it "doesn't use turbolinks" do
Expand Down
1 change: 0 additions & 1 deletion templates/Gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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"
Expand Down
2 changes: 1 addition & 1 deletion templates/application.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@charset "utf-8";

@import "normalize-css";
@import "normalize.css/normalize.css";

@import "bourbon";
@import "neat";
Expand Down

0 comments on commit 3fbdc34

Please sign in to comment.