From 79e9e2d498d211771c53d94740784e0ab1c4289b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Wed, 3 Dec 2025 12:54:39 +0000
Subject: [PATCH 1/4] Fix: Email inline style from Sass variables, e.g. when
 overwriting $mail-font-family in the Custom SCSS field
 https://github.com/humhub/humhub-internal/issues/932

---
 docs/CHANGELOG.md           |  1 +
 views/emails/NewMessage.php | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b2fee1c4..20a75f87 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,6 +10,7 @@ Changelog
 - Fix #465: Extra right scrollbar
 - Enh #466: Convert swagger docs to OpenAPI 3.0
 - Fix #469: In mail notifications, use core button for "Reply now", to allow auto-contrast
+- Fix: Email inline style from Sass variables, e.g. when overwriting `$mail-font-family` in the Custom SCSS field
 
 3.3.5 (September 30, 2025)
 --------------------------
diff --git a/views/emails/NewMessage.php b/views/emails/NewMessage.php
index 277d714c..46d84301 100644
--- a/views/emails/NewMessage.php
+++ b/views/emails/NewMessage.php
@@ -4,7 +4,7 @@
 use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\Message;
 use humhub\modules\mail\models\MessageEntry;
-use humhub\modules\ui\mail\DefaultMailStyle;
+use humhub\modules\ui\mail\MailStyle;
 use humhub\modules\user\models\User;
 use humhub\widgets\mails\MailButton;
 use humhub\widgets\mails\MailButtonList;
@@ -24,14 +24,14 @@
     <td align="center" valign="top"   class="fix-box">
 
         <!-- start  container width 600px -->
-        <table width="600"  align="center" border="0" cellspacing="0" cellpadding="0" class="container" style="background-color: <?= $this->theme->variable('background-color-main') ?>">
+        <table width="600"  align="center" border="0" cellspacing="0" cellpadding="0" class="container" style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
 
 
             <tr>
                 <td valign="top">
 
                     <!-- start container width 560px -->
-                    <table width="540"  align="center" border="0" cellspacing="0" cellpadding="0" class="full-width" style="background-color: <?= $this->theme->variable('background-color-main') ?>">
+                    <table width="540"  align="center" border="0" cellspacing="0" cellpadding="0" class="full-width" style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
 
 
                         <!-- start text content -->
@@ -43,9 +43,9 @@
                                             <!-- start button -->
                                             <table border="0" align="center" cellpadding="0" cellspacing="0">
                                                 <tr>
-                                                    <td width="auto"  align="center" valign="middle" height="28" style=" background-color: <?= $this->theme->variable('background-color-main') ?>; background-clip: padding-box; font-size:26px; font-family: <?= $this->theme->variable('mail-font-family', DefaultMailStyle::DEFAULT_FONT_FAMILY) ?>; text-align:center; color:<?= $this->theme->variable('text-color-soft2') ?>; font-weight: 300; padding:0 18px">
+                                                    <td width="auto"  align="center" valign="middle" height="28" style=" background-color: <?= MailStyle::getBackgroundColorMain() ?>; background-clip: padding-box; font-size:26px; font-family: <?= MailStyle::getFontFamily() ?>; text-align:center; color:<?= MailStyle::getTextColorSoft2() ?>; font-weight: 300; padding:0 18px">
 
-                                                        <span style="color: <?= $this->theme->variable('text-color-main') ?>; font-weight: 300;">
+                                                        <span style="color: <?= MailStyle::getTextColorMain() ?>; font-weight: 300;">
                                                             <?= $headline ?>
                                                         </span>
                                                     </td>
@@ -81,13 +81,13 @@
 
         <!-- start  container width 600px -->
         <table width="600" align="center" border="0" cellspacing="0" cellpadding="0" class="container"
-               style="background-color: <?= $this->theme->variable('background-color-main') ?>; border-radius: 0 0 4px 4px">
+               style="background-color: <?= MailStyle::getBackgroundColorMain() ?>; border-radius: 0 0 4px 4px">
             <tr>
                 <td valign="top">
 
                     <!-- start container width 560px -->
                     <table width="560" align="center" border="0" cellspacing="0" cellpadding="0" class="full-width"
-                           style="background-color: <?= $this->theme->variable('background-color-main') ?>">
+                           style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
 
                         <!-- start image and content -->
                         <tr>
@@ -130,11 +130,11 @@
                                                                align="left">
 
                                                             <tr>
-                                                                <td style="font-size: 13px; line-height: 22px; font-family: <?= $this->theme->variable('mail-font-family', DefaultMailStyle::DEFAULT_FONT_FAMILY) ?>; color:<?= $this->theme->variable('text-color-main') ?>; font-weight:300; text-align:left; ">
+                                                                <td style="font-size: 13px; line-height: 22px; font-family: <?= MailStyle::getFontFamily() ?>; color:<?= MailStyle::getTextColorMain() ?>; font-weight:300; text-align:left; ">
 
-                                                                    <strong><?= $subHeadline ?>
+                                                                    <strong><?= $subHeadline ?></strong>
                                                                     <br><br>
-                                                                    <div style="display:inline-block;background-color:<?= $this->theme->variable('background-color-secondary')?>;border-radius:4px;padding:15px;">
+                                                                    <div style="display:inline-block;background-color:<?= MailStyle::getBackgroundColorSecondary() ?>;border-radius:4px;padding:15px;">
                                                                         <?= $content ?>
                                                                     </div>
 

From bdfa3497ad51cdbe68965d7ece4891b9fac24f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Wed, 3 Dec 2025 12:57:59 +0000
Subject: [PATCH 2/4] Change min version

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 8348ed19..538c7547 100644
--- a/module.json
+++ b/module.json
@@ -10,7 +10,7 @@
   ],
   "version": "3.3.6",
   "humhub": {
-    "minVersion": "1.18"
+    "minVersion": "1.18-beta.6"
   },
   "homepage": "https://github.com/humhub/mail",
   "authors": [

From 37148116baf90ae51ab320bf35ceacc0baf970fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Wed, 3 Dec 2025 12:59:39 +0000
Subject: [PATCH 3/4] Add PR ID to CHANGELOG

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 20a75f87..4998c0e8 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,7 +10,7 @@ Changelog
 - Fix #465: Extra right scrollbar
 - Enh #466: Convert swagger docs to OpenAPI 3.0
 - Fix #469: In mail notifications, use core button for "Reply now", to allow auto-contrast
-- Fix: Email inline style from Sass variables, e.g. when overwriting `$mail-font-family` in the Custom SCSS field
+- Fix #470: Email inline style from Sass variables, e.g. when overwriting `$mail-font-family` in the Custom SCSS field
 
 3.3.5 (September 30, 2025)
 --------------------------

From 6a7320aa3124ac1563b9d2c908abfacd152ae223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Wed, 3 Dec 2025 17:12:27 +0000
Subject: [PATCH 4/4] rename the class humhub\modules\ui\mail\MailStyle to
 humhub\helpers\MailStyleHelper
 https://github.com/humhub/humhub/pull/7872#discussion_r2585392988

---
 views/emails/NewMessage.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/views/emails/NewMessage.php b/views/emails/NewMessage.php
index 46d84301..9b5231ab 100644
--- a/views/emails/NewMessage.php
+++ b/views/emails/NewMessage.php
@@ -4,7 +4,7 @@
 use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\Message;
 use humhub\modules\mail\models\MessageEntry;
-use humhub\modules\ui\mail\MailStyle;
+use humhub\helpers\MailStyleHelper;
 use humhub\modules\user\models\User;
 use humhub\widgets\mails\MailButton;
 use humhub\widgets\mails\MailButtonList;
@@ -24,14 +24,14 @@
     <td align="center" valign="top"   class="fix-box">
 
         <!-- start  container width 600px -->
-        <table width="600"  align="center" border="0" cellspacing="0" cellpadding="0" class="container" style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
+        <table width="600"  align="center" border="0" cellspacing="0" cellpadding="0" class="container" style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>">
 
 
             <tr>
                 <td valign="top">
 
                     <!-- start container width 560px -->
-                    <table width="540"  align="center" border="0" cellspacing="0" cellpadding="0" class="full-width" style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
+                    <table width="540"  align="center" border="0" cellspacing="0" cellpadding="0" class="full-width" style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>">
 
 
                         <!-- start text content -->
@@ -43,9 +43,9 @@
                                             <!-- start button -->
                                             <table border="0" align="center" cellpadding="0" cellspacing="0">
                                                 <tr>
-                                                    <td width="auto"  align="center" valign="middle" height="28" style=" background-color: <?= MailStyle::getBackgroundColorMain() ?>; background-clip: padding-box; font-size:26px; font-family: <?= MailStyle::getFontFamily() ?>; text-align:center; color:<?= MailStyle::getTextColorSoft2() ?>; font-weight: 300; padding:0 18px">
+                                                    <td width="auto"  align="center" valign="middle" height="28" style=" background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>; background-clip: padding-box; font-size:26px; font-family: <?= MailStyleHelper::getFontFamily() ?>; text-align:center; color:<?= MailStyleHelper::getTextColorSoft2() ?>; font-weight: 300; padding:0 18px">
 
-                                                        <span style="color: <?= MailStyle::getTextColorMain() ?>; font-weight: 300;">
+                                                        <span style="color: <?= MailStyleHelper::getTextColorMain() ?>; font-weight: 300;">
                                                             <?= $headline ?>
                                                         </span>
                                                     </td>
@@ -81,13 +81,13 @@
 
         <!-- start  container width 600px -->
         <table width="600" align="center" border="0" cellspacing="0" cellpadding="0" class="container"
-               style="background-color: <?= MailStyle::getBackgroundColorMain() ?>; border-radius: 0 0 4px 4px">
+               style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>; border-radius: 0 0 4px 4px">
             <tr>
                 <td valign="top">
 
                     <!-- start container width 560px -->
                     <table width="560" align="center" border="0" cellspacing="0" cellpadding="0" class="full-width"
-                           style="background-color: <?= MailStyle::getBackgroundColorMain() ?>">
+                           style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>">
 
                         <!-- start image and content -->
                         <tr>
@@ -130,11 +130,11 @@
                                                                align="left">
 
                                                             <tr>
-                                                                <td style="font-size: 13px; line-height: 22px; font-family: <?= MailStyle::getFontFamily() ?>; color:<?= MailStyle::getTextColorMain() ?>; font-weight:300; text-align:left; ">
+                                                                <td style="font-size: 13px; line-height: 22px; font-family: <?= MailStyleHelper::getFontFamily() ?>; color:<?= MailStyleHelper::getTextColorMain() ?>; font-weight:300; text-align:left; ">
 
                                                                     <strong><?= $subHeadline ?></strong>
                                                                     <br><br>
-                                                                    <div style="display:inline-block;background-color:<?= MailStyle::getBackgroundColorSecondary() ?>;border-radius:4px;padding:15px;">
+                                                                    <div style="display:inline-block;background-color:<?= MailStyleHelper::getBackgroundColorSecondary() ?>;border-radius:4px;padding:15px;">
                                                                         <?= $content ?>
                                                                     </div>