tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)

Browse Source 
* 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
This commit is contained in:
Eugen Rochko
2017-05-27 16:55:09 +02:00
committed by GitHub
parent f9180823bc
commit 62ca37884a
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/application.html.haml
View File

@ -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