Require stylesheets in common.js (#4152)

Require stylesheets in common.js because stylesheets are shared by the
entry points.

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index aca64c075121d959faf67245fbbf6a4f5243556a..d7ffa8ea6bf548366fa6506c0b537d30ee562526 100644 (file)
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,9 +1,5 @@
 const perf = require('./performance');
 
-// import default stylesheet with variables
-require('font-awesome/css/font-awesome.css');
-require('mastodon-application-style');
-
 function onDomContentLoaded(callback) {
   if (document.readyState !== 'loading') {
     callback();

diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index 9d63d8f982e84d2098ae4467147c210abdc2b127..a0cb91ae4b9aff82f97bdb58b4ce8e3f09f3b846 100644 (file)
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,2 +1,7 @@
 import { start } from 'rails-ujs';
+
+// import default stylesheet with variables
+require('font-awesome/css/font-awesome.css');
+require('mastodon-application-style');
+
 start();

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 580d8fb4d2942e5b03b45f1312feae7c54872aec..ef97fb12762150d5c4c7727e4a527a2e30a93f27 100755 (executable)
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -18,7 +18,7 @@
         = ' - '
       = title
 
-    = stylesheet_pack_tag 'application', media: 'all'
+    = stylesheet_pack_tag 'common', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 
     = javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'

diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 5680c1ff92a13efe0270a1d31cdab60711678d15..4826f32f75fd4fbbca426da777cc107b850ba5cb 100644 (file)
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
-    = stylesheet_pack_tag 'application', media: 'all'
+    = stylesheet_pack_tag 'common', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'