diff options
| author | kibi! <marrus-sh@users.noreply.github.com> | 2018-01-15 21:17:03 -0800 |
|---|---|---|
| committer | kibi! <marrus-sh@users.noreply.github.com> | 2018-01-15 21:17:03 -0800 |
| commit | cda845ae0e731a0ac3e7e58235c99cbbf93dda69 (patch) | |
| tree | bf8e7fcdc96f02bf6b4ce0973ef91c4becc2b08e | |
| parent | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (diff) | |
Fix mailer to use webpack core
| -rw-r--r-- | app/javascript/core/mailer.js | 1 | ||||
| -rw-r--r-- | app/javascript/core/theme.yml | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/theme.yml | 1 | ||||
| -rw-r--r-- | app/javascript/flavours/vanilla/theme.yml | 1 | ||||
| -rw-r--r-- | app/javascript/packs/mailer.js | 1 | ||||
| -rw-r--r-- | app/views/layouts/mailer.html.haml | 2 |
6 files changed, 7 insertions, 2 deletions
diff --git a/app/javascript/core/mailer.js b/app/javascript/core/mailer.js new file mode 100644 index 000000000..46a23a66a --- /dev/null +++ b/app/javascript/core/mailer.js @@ -0,0 +1 @@ +import 'styles/mailers.scss'; diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml index 0dc05a149..f48ab40c0 100644 --- a/app/javascript/core/theme.yml +++ b/app/javascript/core/theme.yml @@ -10,6 +10,9 @@ pack: embed: embed.js error: home: + mailer: + filename: mailer.js + stylesheet: true modal: public: public.js settings: settings.js diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml index 100e89e3e..0c8342c44 100644 --- a/app/javascript/flavours/glitch/theme.yml +++ b/app/javascript/flavours/glitch/theme.yml @@ -15,6 +15,7 @@ pack: - flavours/glitch/async/getting_started - flavours/glitch/async/home_timeline - flavours/glitch/async/notifications + mailer: modal: public: packs/public.js settings: diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml index 6f6a32c37..f54c231fe 100644 --- a/app/javascript/flavours/vanilla/theme.yml +++ b/app/javascript/flavours/vanilla/theme.yml @@ -15,6 +15,7 @@ pack: - features/compose - features/home_timeline - features/notifications + mailer: modal: public: public.js settings: diff --git a/app/javascript/packs/mailer.js b/app/javascript/packs/mailer.js deleted file mode 100644 index 732fc1698..000000000 --- a/app/javascript/packs/mailer.js +++ /dev/null @@ -1 +0,0 @@ -require('../styles/mailer.scss'); diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 8a7ce4369..511900137 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -6,7 +6,7 @@ %title/ - = stylesheet_pack_tag 'mailer' + = stylesheet_pack_tag 'core/mailer' %body %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody |