about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorAkihiko Odaki (@fn_aki@pawoo.net) <akihiko.odaki.4i@stu.hosei.ac.jp>2017-07-11 22:15:42 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-07-11 15:15:42 +0200
commit8784bd79d0053cb15775eb078f45e6aca7775d77 (patch)
tree5e49ea0fd2068e7180eead837525849471c86096 /app/javascript
parent31366334cb186974fe97234e05fe36d19d33841b (diff)
Require stylesheets in common.js (#4152)
Require stylesheets in common.js because stylesheets are shared by the
entry points.
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/main.js4
-rw-r--r--app/javascript/packs/common.js5
2 files changed, 5 insertions, 4 deletions
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index aca64c075..d7ffa8ea6 100644
--- 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 9d63d8f98..a0cb91ae4 100644
--- 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();