Mail: sitenaam naast het logo; dark mode: card zichtbaar lichter dan de pagina plus rand
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -192,10 +192,24 @@ public class MailTemplateRendererTests
|
||||
{
|
||||
var mail = _renderer.Render(MailKind.Invitation, "nl", Model() with { BrandColor = bad });
|
||||
mail.Html.Should().NotContain("<script>").And.NotContain("url(x)").And.NotContain("background:red;}")
|
||||
.And.Contain("#1f2937");
|
||||
.And.Contain(MailTemplateRenderer.DarkCard);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void InDarkMode_TheCardStandsOutFromThePage_AndHasABorder()
|
||||
{
|
||||
var html = _renderer.Render(MailKind.Invitation, "nl", Model()).Html;
|
||||
|
||||
MailTemplateRenderer.DarkCard.Should().NotBe(MailTemplateRenderer.DarkPage);
|
||||
// clearly lighter than the page, not the near-identical shades it used to be
|
||||
MailColours.Contrast(MailTemplateRenderer.DarkCard, MailTemplateRenderer.DarkPage).Should().BeGreaterThanOrEqualTo(1.4);
|
||||
html.Should().Contain($".mail-page{{background:{MailTemplateRenderer.DarkPage} !important;}}")
|
||||
.And.Contain($".mail-card{{background:{MailTemplateRenderer.DarkCard} !important;color:#f3f4f6 !important;border:1px solid #475569 !important;}}");
|
||||
// light mode is untouched: white card on the light grey page
|
||||
html.Should().Contain("bgcolor=\"#f3f4f6\"").And.Contain("bgcolor=\"#ffffff\"");
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("#ac0000")]
|
||||
[InlineData("#5f6a58")]
|
||||
@@ -219,9 +233,9 @@ public class MailTemplateRendererTests
|
||||
MailColours.Contrast(text, brand).Should().BeGreaterThanOrEqualTo(4.5);
|
||||
html.Should().Contain($"background:{brand};color:{text};");
|
||||
|
||||
var dark = MailColours.DarkAccent(brand, "#1f2937");
|
||||
var dark = MailColours.DarkAccent(brand, MailTemplateRenderer.DarkCard);
|
||||
var darkText = MailColours.ReadableText(dark);
|
||||
MailColours.Contrast(dark, "#1f2937").Should().BeGreaterThanOrEqualTo(4.5); // heading and border on the dark card
|
||||
MailColours.Contrast(dark, MailTemplateRenderer.DarkCard).Should().BeGreaterThanOrEqualTo(4.5); // heading and border on the dark card
|
||||
MailColours.Contrast(darkText, dark).Should().BeGreaterThanOrEqualTo(4.5); // button text on the dark button
|
||||
html.Should().Contain($".mail-btn a{{background:{dark} !important;color:{darkText} !important;");
|
||||
html.Should().Contain($".mail-accent{{color:{dark} !important;");
|
||||
@@ -255,6 +269,23 @@ public class MailTemplateRendererTests
|
||||
html.Should().Contain("class=\"mail-logo-light\" src=\"https://t.nl/admin/brand-logo-on-light.png\" alt=\"Andrea Slop Fotografie\" height=\"56\"");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WithALogo_TheSiteNameStandsNextToIt_InTheAccentColour()
|
||||
{
|
||||
var html = _renderer.Render(MailKind.Invitation, "nl", Model() with { LogoDarkUrl = DarkLogo }).Html;
|
||||
|
||||
// logo and name share one row: [logo] Andrea Slop Fotografie
|
||||
html.Should().MatchRegex("mail-logo-light.*?</td><td class=\"mail-accent mail-site-name\"[^>]*color:#2b6cb0;\">Andrea Slop Fotografie</td>");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TheSiteNameNextToTheLogo_IsHtmlEncoded()
|
||||
{
|
||||
var html = _renderer.Render(MailKind.Invitation, "nl", Model(site: "A<b>&Co") with { }).Html;
|
||||
|
||||
html.Should().Contain("mail-site-name").And.NotContain("<b>&Co");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ADarkLogoWithoutALightLogo_IsIgnored_AndTheSiteNameIsShown()
|
||||
{
|
||||
|
||||
@@ -158,8 +158,12 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer
|
||||
|
||||
private static string E(string value) => WebUtility.HtmlEncode(value);
|
||||
|
||||
private const string DarkPage = "#111827";
|
||||
private const string DarkCard = "#1f2937";
|
||||
// Dark mode mirrors the light layout: the outer page is the darker surface and the card stands out against it
|
||||
// (the earlier #111827 / #1f2937 pair was nearly the same shade, so the card vanished). A 1px border keeps the
|
||||
// edge visible in clients that re-colour the mail themselves (Gmail app, Outlook) and flatten the two backgrounds.
|
||||
public const string DarkPage = "#0a0e14";
|
||||
public const string DarkCard = "#273244";
|
||||
private const string DarkCardBorder = "#475569";
|
||||
|
||||
private static string BuildHtml(
|
||||
MailModel model, string site, string colour, string? greeting, string heading, string intro,
|
||||
@@ -179,7 +183,7 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer
|
||||
sb.Append("<style>:root{color-scheme:light dark;supported-color-schemes:light dark;}");
|
||||
sb.Append("@media (prefers-color-scheme: dark){");
|
||||
sb.Append($".mail-page{{background:{DarkPage} !important;}}");
|
||||
sb.Append($".mail-card{{background:{DarkCard} !important;color:#f3f4f6 !important;}}");
|
||||
sb.Append($".mail-card{{background:{DarkCard} !important;color:#f3f4f6 !important;border:1px solid {DarkCardBorder} !important;}}");
|
||||
sb.Append($".mail-accent{{color:{dark} !important;border-color:{dark} !important;}}");
|
||||
sb.Append($".mail-btn{{background:{dark} !important;border-color:{dark} !important;}}");
|
||||
sb.Append($".mail-btn a{{background:{dark} !important;color:{darkText} !important;border-color:{darkText} !important;}}");
|
||||
@@ -200,9 +204,13 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer
|
||||
// The default logo is meant to be a self-contained image (ASF: a white badge baked into the PNG), so it is
|
||||
// readable in every client, also those that invert colours themselves and ignore the dark-mode rules.
|
||||
// With a dark variant, clients that support prefers-color-scheme swap to it.
|
||||
// The site name stands next to the logo (the logo alone does not always say who is writing), so the
|
||||
// name is a separate text cell and the alt text of the images stays the plain site name too.
|
||||
sb.Append("<table role=\"presentation\" cellpadding=\"0\" cellspacing=\"0\"><tr><td style=\"vertical-align:middle;padding:0 14px 0 0;\">");
|
||||
sb.Append($"<img class=\"mail-logo-light\" src=\"{E(model.LogoUrl)}\" alt=\"{E(site)}\" height=\"56\" style=\"display:block;height:56px;width:auto;border:0;\">");
|
||||
if (hasDarkLogo)
|
||||
sb.Append($"<img class=\"mail-logo-dark\" src=\"{E(model.LogoDarkUrl!)}\" alt=\"{E(site)}\" height=\"48\" style=\"display:none;max-height:0;overflow:hidden;mso-hide:all;height:48px;width:auto;border:0;\">");
|
||||
sb.Append($"</td><td class=\"mail-accent mail-site-name\" style=\"vertical-align:middle;font-size:20px;font-weight:bold;color:{colour};\">{E(site)}</td></tr></table>");
|
||||
}
|
||||
else
|
||||
sb.Append($"<span class=\"mail-accent\" style=\"font-size:20px;font-weight:bold;color:{colour};\">{E(site)}</span>");
|
||||
|
||||
Reference in New Issue
Block a user