Skip to content

Fix: Email inline style from Sass variables, e.g. when overwriting $mail-font-family in the Custom SCSS field #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luke- merged 4 commits into from
Dec 3, 2025
Merged

Fix: Email inline style from Sass variables, e.g. when overwriting $mail-font-family in the Custom SCSS field #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79e9e2d
Fix: Email inline style from Sass variables, e.g. when overwriting $m…
marc-farre Dec 3, 2025
bdfa349
Change min version
marc-farre Dec 3, 2025
3714811
Add PR ID to CHANGELOG
marc-farre Dec 3, 2025
6a7320a
rename the class humhub\modules\ui\mail\MailStyle to humhub\helpers\M…
marc-farre Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #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)
--------------------------
Expand Down
2 changes: 1 addition & 1 deletion module.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"version": "3.3.6",
"humhub": {
"minVersion": "1.18"
"minVersion": "1.18-beta.6"
},
"homepage": "https://github.com/humhub/mail",
"authors": [
Expand Down
20 changes: 10 additions & 10 deletions views/emails/NewMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\helpers\MailStyleHelper;
use humhub\modules\user\models\User;
use humhub\widgets\mails\MailButton;
use humhub\widgets\mails\MailButtonList;
Expand All @@ -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: <?= 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: <?= $this->theme->variable('background-color-main') ?>">
<table width="540" align="center" border="0" cellspacing="0" cellpadding="0" class="full-width" style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>">


<!-- start text content -->
Expand All @@ -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: <?= 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: <?= $this->theme->variable('text-color-main') ?>; font-weight: 300;">
<span style="color: <?= MailStyleHelper::getTextColorMain() ?>; font-weight: 300;">
<?= $headline ?>
</span>
</td>
Expand Down Expand Up @@ -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: <?= 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: <?= $this->theme->variable('background-color-main') ?>">
style="background-color: <?= MailStyleHelper::getBackgroundColorMain() ?>">

<!-- start image and content -->
<tr>
Expand Down Expand Up @@ -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: <?= MailStyleHelper::getFontFamily() ?>; color:<?= MailStyleHelper::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:<?= MailStyleHelper::getBackgroundColorSecondary() ?>;border-radius:4px;padding:15px;">
<?= $content ?>
</div>

Expand Down
Loading