diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png
new file mode 100644
index 0000000000000000000000000000000000000000..e62c064c837a38e059c578c3702259d80f389385
Binary files /dev/null and b/app/javascript/images/mailer/icon_cached.png differ
diff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d2ef0cb87e34633a142ceda4651308421315514
Binary files /dev/null and b/app/javascript/images/mailer/icon_done.png differ
diff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..aae9d2bb9fdadbfe1c8cbc901e2824fbccef0830
Binary files /dev/null and b/app/javascript/images/mailer/icon_email.png differ
diff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png
new file mode 100644
index 0000000000000000000000000000000000000000..895b57d0a479cd084589866a6d48d346b8a23a95
Binary files /dev/null and b/app/javascript/images/mailer/icon_grade.png differ
diff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f62eadc2fa86656f7279d67ba79aebdac9531e5
Binary files /dev/null and b/app/javascript/images/mailer/icon_lock_open.png differ
diff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..3453060aec2615928acac75176905005381ea6c0
Binary files /dev/null and b/app/javascript/images/mailer/icon_person_add.png differ
diff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bce4955c98c70453b7f060d874539d7355ce1a0
Binary files /dev/null and b/app/javascript/images/mailer/icon_reply.png differ
diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c4f332872011decb9658a01e0d4d9e26500485d
Binary files /dev/null and b/app/javascript/images/mailer/logo_full.png differ
diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fda4f67f66d159184eb72272f337281c44f16be
Binary files /dev/null and b/app/javascript/images/mailer/logo_transparent.png differ
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index b3bcc9209c5557bd9a343a5bb6a0c9f8e4ae7726..dbe070f9a3c22fa5c9d6e6605a2c5bc9d7d6c63f 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -17,7 +17,7 @@ body {
-ms-text-size-adjust: 100%;
}
-.email_body {
+.email-body {
td,
div,
a,
@@ -235,6 +235,12 @@ h5 {
color: lighten($ui-base-color, 34%);
}
+.input-cell {
+ h5 {
+ margin-top: 4px;
+ }
+}
+
.input {
td {
background: darken($ui-base-color, 8%);
@@ -512,3 +518,29 @@ ul {
min-height: 1024px !important;
}
}
+
+@media (max-width: 697px) {
+ .email-container,
+ .col-1,
+ .col-2,
+ .col-3,
+ .col-4,
+ .col-5,
+ .col-6 {
+ width: 100% !important;
+ max-width: none !important;
+ }
+
+ .email-start {
+ padding-top: 16px !important;
+ }
+
+ .email-end {
+ padding-bottom: 16px !important;
+ }
+
+ .padded {
+ padding-left: 0 !important;
+ padding-right: 0 !important;
+ }
+}
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index e41b910699eb275a3e07eacfecaaacf8d7cf2f81..6687546fbf8b657f87e708300b8de00c30adb482 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -24,7 +24,7 @@
%tr
%td.column-cell
= link_to root_url do
- = image_tag full_pack_url('logo_full.svg'), alt: 'Mastodon', height: 34, class: 'logo'
+ = image_tag full_pack_url('logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
= yield
@@ -41,15 +41,12 @@
%tr
%td.blank-cell.footer
.email-row
- .col-4
+ .col-6
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%td.column-cell
%p= t 'about.hosted_on', domain: site_hostname
%p= link_to t('application_mailer.notification_preferences'), settings_notifications_url
- .col-2
- %table.column{ cellspacing: 0, cellpadding: 0 }
- %tbody
%td.column-cell.text-right
= link_to root_url do
- = image_tag full_pack_url('logo_transparent.svg'), alt: 'Mastodon', height: 24
+ = image_tag full_pack_url('logo_transparent.png'), alt: 'Mastodon', height: 24
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index f26b08b18e8fb54cb1cb2204e5fc5d449cfd76aa..7d1b494d0968f82b8259775c35feb50372f9182b 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_grade.svg'), alt:''
+ = image_tag full_pack_url('icon_grade.png'), alt:''
%h1= t 'notification_mailer.favourite.title'
%p.lead= t('notification_mailer.favourite.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index 1290e2bc4140d996e777c9d7e93e51246a42cebb..31a2b744540ade19b1739d26fc1fcb5fa16b695b 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_person_add.svg'), alt: ''
+ = image_tag full_pack_url('icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow.title'
%p.lead= t('notification_mailer.follow.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 41efeafaf6a56a1af4d9fcb1747b527978acdd5b..44f1911c403a83e747dd994a2507eb7bb53b8cfa 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_person_add.svg'), alt: ''
+ = image_tag full_pack_url('icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow_request.title'
%p.lead= t('notification_mailer.follow_request.body', name: @account.acct)
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 619c580ce74c0410922c1bf063468e39df004b2f..479fed41ccdd50058b08b7c19412ac952ed39007 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_reply.svg'), alt: ''
+ = image_tag full_pack_url('icon_reply.png'), alt: ''
%h1= t 'notification_mailer.mention.title'
%p.lead= t('notification_mailer.mention.body', name: @status.account.acct)
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index 61c6ee6be8c6a18ea122730e5acf89a7e4ece972..85b202cf932693538b6072896e9ca2cb3daaaff3 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_cached.svg'), alt: ''
+ = image_tag full_pack_url('icon_cached.png'), alt: ''
%h1= t 'notification_mailer.reblog.title'
%p.lead= t('notification_mailer.reblog.body', name: @account.acct)
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 0f999bcbcb28afb14872a0621fbbe6d5473a9dfe..1f088a16f4f6b2fc0cd8d327de6e0bd665f4fa80 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.confirmation_instructions.title'
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 45dc066509009a04994ba82bc40dca6167c2d8ae..7e82f23e4ad05a582829a74051297ccd8ab7c0ab 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.email_changed.title'
%p.lead= t 'devise.mailer.email_changed.explanation'
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 2e9377dff14b039e4a0c00633c2a53fa13a27a57..26314a21793b23c075d33544abfa53ac3cc9fcb9 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
+ = image_tag full_pack_url('icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.password_change.title'
%p.lead= t 'devise.mailer.password_change.explanation'
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 3ae226093931b4fc0ebc4cafc8f2a0e6fafdb78a..e3be8e295e65f2403e4e0a9eb98e98071abe9e41 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.reconfirmation_instructions.title'
%p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index c0e6775d4a9832c805a56f2cc6d1022e98a4cd38..5d9ce6a7534a0ce71a6283b2f573b7e8e46917ac 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
+ = image_tag full_pack_url('icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.reset_password_instructions.title'
%p.lead= t 'devise.mailer.reset_password_instructions.explanation'
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 0823efa1ae6b82f4cf5983e8440ab33964c4704d..d734da67db2d2cde0cccd507d9f3b5cf092022fc 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_done.svg'), alt: ''
+ = image_tag full_pack_url('icon_done.png'), alt: ''
%h1= t 'user_mailer.welcome.title', name: @resource.account.username
%p.lead= t 'user_mailer.welcome.explanation'
@@ -30,7 +30,7 @@
%table.content-section{ cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td.content-cell
+ %td.content-cell.content-start
.email-row
.col-3
%table.column{ cellspacing: 0, cellpadding: 0 }
@@ -46,7 +46,7 @@
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td.column-cell.content-start
+ %td.column-cell
%p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
%table.email-table{ cellspacing: 0, cellpadding: 0 }
@@ -69,7 +69,7 @@
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td.column-cell
+ %td.column-cell.padded
%table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
%tbody
%tr
@@ -89,7 +89,7 @@
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td.column-cell
+ %td.column-cell.padded
%table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
%tbody
%tr
@@ -109,7 +109,7 @@
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td.column-cell
+ %td.column-cell.padded
%table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
%tbody
%tr
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 8223294905f8e15afd46d139861b4e44ddb687c1..26747e76b37a50e3edaa8c69de0b02fbdb1a4bf7 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') {
const output = {
path: resolve('public', settings.public_output_path),
- publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
+ publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
};
module.exports = {
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
index 4ea3ce80c78ae49add60e68253efdcd37fdf89b8..84d83cc6603be09245fa070a7c0ae6845f93876c 100644
--- a/lib/mastodon/premailer_webpack_strategy.rb
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -2,6 +2,9 @@
module PremailerWebpackStrategy
def load(url)
+ public_path_host = ENV['ASSET_HOST'] || ENV['LOCAL_DOMAIN']
+ url = url.gsub(/\A\/\/#{public_path_host}/, '')
+
if Webpacker.dev_server.running?
url = File.join("#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}", url)
HTTP.get(url).to_s