]> cat aescling's git repositories - mastodon.git/commit
Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 27 May 2017 14:55:09 +0000 (16:55 +0200)
committerGitHub <noreply@github.com>
Sat, 27 May 2017 14:55:09 +0000 (16:55 +0200)
commit62ca37884af11dacca51ef35c43a7f4805c91c5f
treea04f99ee7fef13cf1c0358b464a125139e61ff94
parentf9180823bc476bfe83baeb0bc3924883927a8c1c
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
app/assets/stylesheets/.gitkeep [deleted file]
app/helpers/style_helper.rb [new file with mode: 0644]
app/javascript/mastodon/main.js
app/views/layouts/application.html.haml
config/webpack/shared.js