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-06-02 03:56:32 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-01 20:56:32 +0200
commite98559c3ff79ccc9b5b866c5351416dd58f2ebee (patch)
tree3f755ee308b0b51ac3e492bc58b37c5a86804a40 /app/javascript
parent2212dc4aaa6de729d2fe3e39b134b566935b11b7 (diff)
Resolve custom application stylesheet with Webpack (#3373)
This implementation is a bit smaller and still has the following benefits:

* No need of app/javascript/packs/custom.js
For custom stylesheet, it typically has only
"require('../styles/custom.scss')" and is redundant.

* No need to extract vendor stylesheet to another asset
Extracting vendor stylesheet could be forgotten by developers who do not
use custom stylesheet.
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 2031cad16..02e0f56f9 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -2,7 +2,7 @@ const perf = require('./performance');
 
 // import default stylesheet with variables
 require('font-awesome/css/font-awesome.css');
-require('../styles/application.scss');
+require('mastodon-application-style');
 
 function onDomContentLoaded(callback) {
   if (document.readyState !== 'loading') {