From 072f6c57a827effd2c4718ca74d9f24a527bb4c7 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Tue, 17 Feb 2026 11:33:15 -0500 Subject: [PATCH] [PM-27882] Revert row bulletin changes for confirmation templates. (#7018) --- ...onConfirmationEnterpriseTeamsView.html.hbs | 12 +- ...izationConfirmationFamilyFreeView.html.hbs | 12 +- src/Core/MailTemplates/Mjml/.mjmlconfig | 1 + ...ization-confirmation-enterprise-teams.mjml | 4 +- ...organization-confirmation-family-free.mjml | 8 +- .../mj-bw-ac-icon-row-without-bulletins.js | 103 ++++++++++++++++++ 6 files changed, 114 insertions(+), 26 deletions(-) create mode 100644 src/Core/MailTemplates/Mjml/emails/AdminConsole/components/mj-bw-ac-icon-row-without-bulletins.js diff --git a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationEnterpriseTeamsView.html.hbs b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationEnterpriseTeamsView.html.hbs index 9d3c241a02..837f1b2081 100644 --- a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationEnterpriseTeamsView.html.hbs +++ b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationEnterpriseTeamsView.html.hbs @@ -87,12 +87,6 @@ .mj-bw-ac-icon-row-text-column { width: 100% !important; } - .mj-bw-ac-icon-row-bullet { - display: block !important; - } - .mj-bw-ac-icon-row-text-inline { - display: none !important; - } } @@ -356,8 +350,7 @@ -
- Your account is owned by {{OrganizationName}} and is subject to their security and management policies.
+
Your account is owned by {{OrganizationName}} and is subject to their security and management policies.
@@ -431,8 +424,7 @@ -
- You can easily access and share passwords with your team.
+
You can easily access and share passwords with your team.
diff --git a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationFamilyFreeView.html.hbs b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationFamilyFreeView.html.hbs index 699a1005ab..e53af9eebe 100644 --- a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationFamilyFreeView.html.hbs +++ b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationFamilyFreeView.html.hbs @@ -91,12 +91,6 @@ .mj-bw-ac-icon-row-text-column { width: 100% !important; } - .mj-bw-ac-icon-row-bullet { - display: block !important; - } - .mj-bw-ac-icon-row-text-inline { - display: none !important; - } } @@ -364,8 +358,7 @@ -
- You can access passwords {{OrganizationName}} has shared with you.
+
You can access passwords {{OrganizationName}} has shared with you.
@@ -439,8 +432,7 @@ -
- You can easily share passwords with friends, family, or coworkers.
+
You can easily share passwords with friends, family, or coworkers.
diff --git a/src/Core/MailTemplates/Mjml/.mjmlconfig b/src/Core/MailTemplates/Mjml/.mjmlconfig index caff8a7d40..c26b43ced4 100644 --- a/src/Core/MailTemplates/Mjml/.mjmlconfig +++ b/src/Core/MailTemplates/Mjml/.mjmlconfig @@ -7,6 +7,7 @@ "emails/AdminConsole/components/mj-bw-inviter-info", "emails/AdminConsole/components/mj-bw-ac-hero", "emails/AdminConsole/components/mj-bw-ac-icon-row", + "emails/AdminConsole/components/mj-bw-ac-icon-row-without-bulletins", "emails/AdminConsole/components/mj-bw-ac-learn-more-footer" ] } diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml index 02c9eea37d..7f7b6d4777 100644 --- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml +++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml @@ -26,12 +26,12 @@ - - - - - + - + diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/components/mj-bw-ac-icon-row-without-bulletins.js b/src/Core/MailTemplates/Mjml/emails/AdminConsole/components/mj-bw-ac-icon-row-without-bulletins.js new file mode 100644 index 0000000000..26e1340a72 --- /dev/null +++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/components/mj-bw-ac-icon-row-without-bulletins.js @@ -0,0 +1,103 @@ +const { BodyComponent } = require("mjml-core"); + +const BODY_TEXT_STYLES = ` + font-family="'Helvetica Neue', Helvetica, Arial, sans-serif" + font-size="16px" + font-weight="400" + line-height="24px" +`; + +class MjBwAcIconRowWithoutBulletins extends BodyComponent { + static dependencies = { + "mj-column": ["mj-bw-ac-icon-row-without-bulletins"], + "mj-wrapper": ["mj-bw-ac-icon-row-without-bulletins"], + "mj-bw-ac-icon-row-without-bulletins": [], + }; + + static allowedAttributes = { + "icon-src": "string", + "icon-alt": "string", + "head-url-text": "string", + "head-url": "string", + text: "string", + "foot-url-text": "string", + "foot-url": "string", + }; + + static defaultAttributes = {}; + + headStyle = (breakpoint) => { + return ` + @media only screen and (max-width:${breakpoint}) { + .mj-bw-ac-icon-row-text { + padding-left: 15px !important; + padding-right: 15px !important; + line-height: 20px; + } + .mj-bw-ac-icon-row-icon { + display: none !important; + width: 0 !important; + max-width: 0 !important; + } + .mj-bw-ac-icon-row-text-column { + width: 100% !important; + } + } + `; + }; + + render() { + const headAnchorElement = + this.getAttribute("head-url-text") && this.getAttribute("head-url") + ? ` + + + ${this.getAttribute("head-url-text")} + + External Link Icon + + + ` + : ""; + + const footAnchorElement = + this.getAttribute("foot-url-text") && this.getAttribute("foot-url") + ? ` + + ${this.getAttribute("foot-url-text")} + + ` + : ""; + + return this.renderMJML( + ` + + + + + + + ${headAnchorElement} + + ${this.getAttribute("text")} + + ${footAnchorElement} + + + + `, + ); + } +} + +module.exports = MjBwAcIconRowWithoutBulletins;