Cherry-Pick: Add "do not reply to this automated message" copy to rem…

…aining emails, fix X logo location, swap Twitter for X on other automated email templates (#24528) For consistency with new MFA email in #22078. Merged into `main` via #24506.
fleetdm · Dec 9, 2024 · d9ed9ce · d9ed9ce
1 parent 4a262ca
commit d9ed9ce
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/changes/22078-do-not-reply b/changes/22078-do-not-reply
@@ -0,0 +1 @@
+* Add language in email templates indicating that users should not reply to the automated emails
diff --git a/changes/22078-x b/changes/22078-x
@@ -0,0 +1 @@
+* Switch Twitter logo to X logo in Fleet-initiated automated emails
diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html
@@ -131,6 +131,9 @@ <h1>Confirm your updated email address</h1>
                 >
                   Confirm email
                 </a>
+                <p style="font-size: 14px; color: #515774; padding-top: 32px">
+                  Please do not reply to this automated message.
+                </p>
 
                 <div
                   style="border-bottom: 1px solid #e2e4ea; padding-top: 32px"
@@ -145,9 +148,9 @@ <h1>Confirm your updated email address</h1>
                   </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
-                      alt="Twitter logo"
-                      style="height: 20px; width: 25px; padding-right: 20px"
-                      src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
+                      alt="X logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/x-logo-24x24@2x.png"
                     />
                   </a>
                   <a

diff --git a/server/mail/templates/invite_token.html b/server/mail/templates/invite_token.html
@@ -164,6 +164,10 @@ <h1>You have been invited to Fleet!</h1>
                 </a>
                 {{end}}
 
+                <p style="font-size: 14px; color: #515774; padding-top: 32px">
+                  Please do not reply to this automated message.
+                </p>
+
                 <div
                   style="border-bottom: 1px solid #e2e4ea; padding-top: 32px"
                 ></div>

diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html
@@ -137,6 +137,9 @@ <h1>Reset your Fleet password</h1>
                 <p style="font-style: italic; padding-top: 32px; padding-bottom: 0;">
                   If you did not make the request, you may ignore this email as no changes have been made.
                 </p>
+                <p style="font-size: 14px; color: #515774; padding-top: 32px">
+                  Please do not reply to this automated message.
+                </p>
                 <div
                   style="border-bottom: 1px solid #e2e4ea; padding-top: 32px"
                 ></div>
@@ -150,9 +153,9 @@ <h1>Reset your Fleet password</h1>
                   </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
-                      alt="Twitter logo"
-                      style="height: 20px; width: 25px; padding-right: 20px"
-                      src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
+                      alt="X logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/x-logo-24x24@2x.png"
                     />
                   </a>
                   <a

diff --git a/server/mail/templates/smtp_setup.html b/server/mail/templates/smtp_setup.html
@@ -108,6 +108,9 @@
               >
                 <h1>Fleet SMTP setup confirmed</h1>
                 <p>This message confirms that SMTP is set up properly <a href="{{.BaseURL}}">on your Fleet instance</a>.</p>
+                <p style="font-size: 14px; color: #515774">
+                  Please do not reply to this automated message.
+                </p>
                 <div
                   style="
                     border-top: 1px solid #e2e4ea;
@@ -124,9 +127,9 @@ <h1>Fleet SMTP setup confirmed</h1>
                   </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
-                      alt="Twitter logo"
-                      style="height: 20px; width: 25px; padding-right: 20px"
-                      src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
+                      alt="X logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/x-logo-24x24@2x.png"
                     />
                   </a>
                   <a

diff --git a/assets/images/x-logo-24x24@2x.png → ...sets/images/permanent/x-logo-24x24@2x.png b/assets/images/x-logo-24x24@2x.png → ...sets/images/permanent/x-logo-24x24@2x.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Add language in email templates indicating that users should not reply to the automated emails
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Switch Twitter logo to X logo in Fleet-initiated automated emails
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,6 +164,10 @@ <h1>You have been invited to Fleet!</h1> @@
                     </a>
                     {{end}}
+                    <p style="font-size: 14px; color: #515774; padding-top: 32px">
+                      Please do not reply to this automated message.
+                    </p>
                     <div
                       style="border-bottom: 1px solid #e2e4ea; padding-top: 32px"
                     ></div>
@@ Expand Down @@