Skip to content

Commit e48b508

Browse files
committed
Merge pull request shakacode#255 from shakacode/remove-erb-suffix
Remove unnecessary erb suffix
2 parents b192ef2 + a02ecbc commit e48b508

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

app/assets/stylesheets/application_static.scss.erb renamed to app/assets/stylesheets/application_static.scss

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
// Super important: This file is loaded even for hot loading only, so we need to be sure
55
// that we don't reference the static generated CSS files.
6-
<% unless ENV["REACT_ON_RAILS_ENV"] == "HOT" %>
7-
@import 'vendor-bundle';
8-
@import 'app-bundle';
9-
<% end %>
6+
@import 'vendor-bundle';
7+
@import 'app-bundle';
108

119
// Non-webpack assets
1210
@import 'application_non_webpack';

0 commit comments

Comments
 (0)