diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-27 16:55:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 16:55:09 +0200 |
| commit | 62ca37884af11dacca51ef35c43a7f4805c91c5f (patch) | |
| tree | a04f99ee7fef13cf1c0358b464a125139e61ff94 /app/views/layouts | |
| parent | f9180823bc476bfe83baeb0bc3924883927a8c1c (diff) | |
Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
* Fix #2922 - Load stylesheet from "custom.css" entrypoint when present
This is pretty much the same way it worked as before, albeit with
having to create app/javascript/packs/custom.js with
require('../styles/custom.scss') (or whatever you want really), which
will be a blank slate for you to import whatever you want
* Remove old assets directory
* Extract font-awesome into common.css and always load it
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f991bc74f..ab7c22385 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,7 +18,8 @@ = ' - ' = title - = stylesheet_pack_tag 'application', media: 'all' + = stylesheet_pack_tag 'common', media: 'all' + = stylesheet_pack_tag stylesheet_for_layout, media: 'all' = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags |