From a4ecc008fac61faab80b247e8c45311201b3f293 Mon Sep 17 00:00:00 2001 From: Matthew Birtch Date: Mon, 22 Jun 2026 10:41:36 -0400 Subject: [PATCH] MM-68232: Remove external Google Fonts from email templates (#36011) * remove google font dependency from emails * fix malformed anchor closing tag in cloud_welcome_email.html --------- Co-authored-by: Jesse Hallam --- server/templates/cloud_14_day_arrears.html | 30 ++--- server/templates/cloud_30_day_arrears.html | 34 ++--- server/templates/cloud_30_day_arrears.mjml | 10 +- server/templates/cloud_45_day_arrears.html | 34 ++--- server/templates/cloud_7_day_arrears.html | 30 ++--- server/templates/cloud_90_day_arrears.html | 34 ++--- .../templates/cloud_renewal_notification.html | 28 ++--- .../templates/cloud_upgrade_confirmation.html | 26 ++-- .../templates/cloud_upgrade_confirmation.mjml | 10 +- server/templates/cloud_welcome_email.html | 30 ++--- .../templates/email_change_verify_body.html | 14 +-- server/templates/invite_body.html | 40 +++--- server/templates/ip_filters_changed.html | 32 ++--- server/templates/license_notification.html | 18 +-- server/templates/messages_notification.html | 116 ++++++++---------- .../cloud_questions_hr_email_footer.mjml | 2 +- .../cloud_title_2subtitles_button.mjml | 8 +- .../cloud_title_3subtitles_button.mjml | 10 +- .../templates/partials/message_attachment.css | 4 +- .../partials/message_attachment.html | 2 +- server/templates/partials/style.css | 10 +- server/templates/partials/style.mjml | 6 +- server/templates/payment_failed_body.html | 34 ++--- server/templates/payment_failed_body.mjml | 10 +- server/templates/reset_body.html | 30 ++--- server/templates/verify_body.html | 32 ++--- server/templates/welcome_body.html | 34 ++--- 27 files changed, 269 insertions(+), 399 deletions(-) diff --git a/server/templates/cloud_14_day_arrears.html b/server/templates/cloud_14_day_arrears.html index ebd1e3dcc12..3c8b66767c0 100644 --- a/server/templates/cloud_14_day_arrears.html +++ b/server/templates/cloud_14_day_arrears.html @@ -58,12 +58,6 @@ .mj-outlook-group-fix { width:100% !important; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -30,11 +26,11 @@

+ style="font-family: sans-serif; font-style: normal; font-weight: 600; font-size: 28px; line-height: 36px; letter-spacing: -0.02em; color: #3D3C40;"> {{.Props.Title}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 16px; line-height: 24px; color: #3D3C40;"> {{.Props.Info}} {{.Props.DNS}}. @@ -42,7 +38,7 @@

{{.Props.Button}} + style="padding: 14px 24px; position: static; background: #1C58D9; border-radius: 4px; margin: 0px 150px; font-family: sans-serif; font-style: normal; font-weight: 600; font-size: 16px; line-height: 18px; color: #FFFFFF; text-decoration: none;">{{.Props.Button}}

@@ -51,11 +47,11 @@

+ style="font-family: sans-serif; font-weight: 600; font-size: 22px; line-height: 28px; color: #3D3C40;"> {{.Props.SubTitle}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; color: #3D3C40;"> {{.Props.SubTitleInfo}}

@@ -70,11 +66,11 @@ style="height: 15px; width: 15px; transform: translateY(2px);" alt="c_avatar"> + style="font-family: sans-serif; font-style: normal; font-weight: 600; font-size: 16px; line-height: 24px; color: #3D3C40; margin-left: 8px;"> {{.Props.InviteInfo}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; color: #3D3C40; margin-left: 26px;"> {{.Props.InviteSubInfo}} + style="font-family: sans-serif; font-style: normal; font-weight: 600; font-size: 16px; line-height: 24px; color: #3D3C40; margin-left: 8px;"> {{.Props.AddAppsInfo}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; color: #3D3C40; margin-left: 26px;"> {{.Props.AddAppsSubInfo}} + style="font-family: sans-serif; font-style: normal; font-weight: 600; font-size: 16px; line-height: 24px; color: #3D3C40; margin-left: 8px;"> {{.Props.DownloadMMInfo}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; color: #3D3C40; margin-left: 26px;"> {{.Props.SignInSubInfo}}

+ style="font-family: sans-serif; font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; color: #3D3C40;"> {{.Props.GettingStartedQuestions}} support@mattermost.com. @@ -150,7 +146,7 @@ diff --git a/server/templates/email_change_verify_body.html b/server/templates/email_change_verify_body.html index 22a1cec84d3..1ec7fbb5bce 100644 --- a/server/templates/email_change_verify_body.html +++ b/server/templates/email_change_verify_body.html @@ -1,10 +1,6 @@ {{define "email_change_verify_body"}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

{{.Props.Organization}} +

{{.Props.Organization}} {{.Props.FooterV2}}