diff --git a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap index 4315ec4374..a40dc54480 100644 --- a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap +++ b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap @@ -8,114 +8,102 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a 👍 New recommendation +@media only screen and (max-width: 620px) { + table.body h1 { + font-size: 22px !important; + padding-bottom: 16px !important; + } + + table.body p, +table.body ul, +table.body ol, +table.body td, +table.body span, +table.body a { + font-size: 16px !important; + } + + table.body .wrapper, +table.body .article { + padding: 10px !important; + } + + table.body .content { + padding: 0 !important; + } + + table.body .container { + padding: 0 !important; + width: 100% !important; + } + + table.body .main { + border-left-width: 0 !important; + border-radius: 0 !important; + border-right-width: 0 !important; + } + + table.body .img-responsive { + height: auto !important; + max-width: 100% !important; + width: auto !important; + } + + table.body p.large, +table.body p.large a { + font-size: 18px !important; + } + + table.body p.small, +table.body a.small { + font-size: 12px !important; + } + + .new-mention-thumbnail { + display: none !important; + } +} +@media all { + .ExternalClass { + width: 100%; + } + + .ExternalClass, +.ExternalClass p, +.ExternalClass span, +.ExternalClass font, +.ExternalClass td, +.ExternalClass div { + line-height: 100%; + } + + .text-link a { + color: inherit !important; + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + .text-link-accent a { + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + #MessageViewBody a { + color: inherit; + text-decoration: none; + font-size: inherit; + font-family: inherit; + font-weight: inherit; + line-height: inherit; + } +} + @@ -138,7 +126,7 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
- +
@@ -179,7 +167,7 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a - View recommendations + View recommendations @@ -264,114 +252,102 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend 👍 New recommendation +@media only screen and (max-width: 620px) { + table.body h1 { + font-size: 22px !important; + padding-bottom: 16px !important; + } + + table.body p, +table.body ul, +table.body ol, +table.body td, +table.body span, +table.body a { + font-size: 16px !important; + } + + table.body .wrapper, +table.body .article { + padding: 10px !important; + } + + table.body .content { + padding: 0 !important; + } + + table.body .container { + padding: 0 !important; + width: 100% !important; + } + + table.body .main { + border-left-width: 0 !important; + border-radius: 0 !important; + border-right-width: 0 !important; + } + + table.body .img-responsive { + height: auto !important; + max-width: 100% !important; + width: auto !important; + } + + table.body p.large, +table.body p.large a { + font-size: 18px !important; + } + + table.body p.small, +table.body a.small { + font-size: 12px !important; + } + + .new-mention-thumbnail { + display: none !important; + } +} +@media all { + .ExternalClass { + width: 100%; + } + + .ExternalClass, +.ExternalClass p, +.ExternalClass span, +.ExternalClass font, +.ExternalClass td, +.ExternalClass div { + line-height: 100%; + } + + .text-link a { + color: inherit !important; + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + .text-link-accent a { + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + #MessageViewBody a { + color: inherit; + text-decoration: none; + font-size: inherit; + font-family: inherit; + font-weight: inherit; + line-height: inherit; + } +} + @@ -395,7 +371,7 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
- +
@@ -436,7 +412,7 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend - Recommend back + Recommend back @@ -499,114 +475,102 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend 👍 New recommendation +@media only screen and (max-width: 620px) { + table.body h1 { + font-size: 22px !important; + padding-bottom: 16px !important; + } + + table.body p, +table.body ul, +table.body ol, +table.body td, +table.body span, +table.body a { + font-size: 16px !important; + } + + table.body .wrapper, +table.body .article { + padding: 10px !important; + } + + table.body .content { + padding: 0 !important; + } + + table.body .container { + padding: 0 !important; + width: 100% !important; + } + + table.body .main { + border-left-width: 0 !important; + border-radius: 0 !important; + border-right-width: 0 !important; + } + + table.body .img-responsive { + height: auto !important; + max-width: 100% !important; + width: auto !important; + } + + table.body p.large, +table.body p.large a { + font-size: 18px !important; + } + + table.body p.small, +table.body a.small { + font-size: 12px !important; + } + + .new-mention-thumbnail { + display: none !important; + } +} +@media all { + .ExternalClass { + width: 100%; + } + + .ExternalClass, +.ExternalClass p, +.ExternalClass span, +.ExternalClass font, +.ExternalClass td, +.ExternalClass div { + line-height: 100%; + } + + .text-link a { + color: inherit !important; + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + .text-link-accent a { + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } + + #MessageViewBody a { + color: inherit; + text-decoration: none; + font-size: inherit; + font-family: inherit; + font-weight: inherit; + line-height: inherit; + } +} + @@ -630,7 +594,7 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
- +
@@ -671,7 +635,7 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend - Recommend back + Recommend back diff --git a/ghost/staff-service/lib/email-templates/donation.hbs b/ghost/staff-service/lib/email-templates/donation.hbs index 76c10e231b..c1896b924e 100644 --- a/ghost/staff-service/lib/email-templates/donation.hbs +++ b/ghost/staff-service/lib/email-templates/donation.hbs @@ -37,9 +37,9 @@

From:

- +

Amount received:

-

{{donation.amount}}

+

{{donation.amount}}

{{#if donation.donationMessage}}

“{{donation.donationMessage}}”

{{/if}} diff --git a/ghost/staff-service/lib/email-templates/new-free-signup.hbs b/ghost/staff-service/lib/email-templates/new-free-signup.hbs index 3263e6a750..db82aa1f51 100644 --- a/ghost/staff-service/lib/email-templates/new-free-signup.hbs +++ b/ghost/staff-service/lib/email-templates/new-free-signup.hbs @@ -42,13 +42,13 @@

Name:

- + {{#if referrerSource}}

Source:

-

{{referrerSource}}

+

{{referrerSource}}

{{#if attributionTitle}}

Page:

- + {{/if}} {{/if}} diff --git a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs index d5050d0aab..5d0aabb3d3 100644 --- a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs +++ b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs @@ -46,15 +46,15 @@

Name:

- +

Tier:

- + {{#if subscriptionData.cancelNow}}

Expired on:

{{else}}

Expires on:

{{/if}} - + {{#if subscriptionData.cancellationReason}}

"{{subscriptionData.cancellationReason}}"

{{/if}} diff --git a/ghost/staff-service/lib/email-templates/new-paid-started.hbs b/ghost/staff-service/lib/email-templates/new-paid-started.hbs index 8d6d96db63..38cc764c65 100644 --- a/ghost/staff-service/lib/email-templates/new-paid-started.hbs +++ b/ghost/staff-service/lib/email-templates/new-paid-started.hbs @@ -42,19 +42,19 @@

Name:

- +

Tier:

- + {{#if offerData}}

Offer:

- + {{/if}} {{#if referrerSource}}

Source:

-

{{referrerSource}}

+

{{referrerSource}}

{{#if attributionTitle}}

Page:

- + {{/if}} {{/if}} diff --git a/ghost/staff-service/lib/email-templates/partials/styles.hbs b/ghost/staff-service/lib/email-templates/partials/styles.hbs index 10a74ed21c..7de00b563c 100644 --- a/ghost/staff-service/lib/email-templates/partials/styles.hbs +++ b/ghost/staff-service/lib/email-templates/partials/styles.hbs @@ -3,48 +3,46 @@ RESPONSIVE AND MOBILE FRIENDLY STYLES ------------------------------------- */ @media only screen and (max-width: 620px) { - table[class=body] h1 { - font-size: 28px !important; - margin-bottom: 10px !important; + table.body h1 { + font-size: 22px !important; + padding-bottom: 16px !important; } - table[class=body] p, - table[class=body] ul, - table[class=body] ol, - table[class=body] td, - table[class=body] span, - table[class=body] a { + table.body p, + table.body ul, + table.body ol, + table.body td, + table.body span, + table.body a { font-size: 16px !important; } - table[class=body] .wrapper, - table[class=body] .article { + table.body .wrapper, + table.body .article { padding: 10px !important; } - table[class=body] .content { + table.body .content { padding: 0 !important; } - table[class=body] .container { + table.body .container { padding: 0 !important; width: 100% !important; } - table[class=body] .main { + table.body .main { border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } - table[class=body] .btn table { - width: 100% !important; - } - table[class=body] .btn a { - width: 100% !important; - } - table[class=body] .img-responsive { + table.body .img-responsive { height: auto !important; max-width: 100% !important; width: auto !important; } - table[class=body] p[class=small], - table[class=body] a[class=small] { - font-size: 11px !important; + table.body p.large, + table.body p.large a { + font-size: 18px !important; + } + table.body p.small, + table.body a.small { + font-size: 12px !important; } .new-mention-thumbnail { display: none !important; @@ -74,6 +72,13 @@ line-height: inherit !important; text-decoration: none !important; } + .text-link-accent a { + font-family: inherit !important; + font-size: inherit !important; + font-weight: inherit !important; + line-height: inherit !important; + text-decoration: none !important; + } #MessageViewBody a { color: inherit; text-decoration: none;