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

1 files changed, 0 insertions, 6 deletions

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 44148fa92..2031cad16 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -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'));