diff options
| author | Akihiko Odaki (@fn_aki@pawoo.net) <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-06-02 03:56:32 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-01 20:56:32 +0200 |
| commit | e98559c3ff79ccc9b5b866c5351416dd58f2ebee (patch) | |
| tree | 3f755ee308b0b51ac3e492bc58b37c5a86804a40 /app | |
| parent | 2212dc4aaa6de729d2fe3e39b134b566935b11b7 (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')
| -rw-r--r-- | app/helpers/style_helper.rb | 17 | ||||
| -rw-r--r-- | app/javascript/mastodon/main.js | 2 | ||||
| -rwxr-xr-x | app/views/layouts/application.html.haml | 3 |
3 files changed, 2 insertions, 20 deletions
diff --git a/app/helpers/style_helper.rb b/app/helpers/style_helper.rb deleted file mode 100644 index b695f8f3e..000000000 --- a/app/helpers/style_helper.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module StyleHelper - def stylesheet_for_layout - if asset_exist? 'custom.css' - 'custom' - else - 'application' - end - end - - def asset_exist?(path) - true if Webpacker::Manifest.lookup(path) - rescue Webpacker::FileLoader::NotFoundError - false - end -end 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') { diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ab7c22385..f991bc74f 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,8 +18,7 @@ = ' - ' = title - = stylesheet_pack_tag 'common', media: 'all' - = stylesheet_pack_tag stylesheet_for_layout, media: 'all' + = stylesheet_pack_tag 'application', media: 'all' = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags |