Unfloyded/Legamunt
0
0
Fork 0
Code 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

6
app/javascript/mastodon/main.js
View file

@ -1,8 +1,5 @@
const perf = require('./performance');
// allow override variables here
require.context('../../assets/stylesheets/', false, /variables.*\.scss$/);
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('../styles/application.scss');
@ -23,9 +20,6 @@ function main() {
require.context('../images/', true);
// import customization styles
require.context('../../assets/stylesheets/', false, /custom.*\.scss$/);
onDomContentLoaded(() => {
const mountNode = document.getElementById('mastodon');
const props = JSON.parse(mountNode.getAttribute('data-props'));