fix(theme): make shared status and supporting text readable
This commit is contained in:
@@ -356,7 +356,7 @@
|
||||
.rail-section:not([open]) > .rail-section-body { display: none; }
|
||||
|
||||
/* StatusPill: info variant (on-palette, reuses the info blue wash) */
|
||||
.chip-info { color: var(--accent-deep); background: var(--info-bg); border-color: var(--info-border); }
|
||||
.chip-info { color: var(--info-ink); background: var(--info-bg); border-color: var(--info-border); }
|
||||
|
||||
/* TechCard body/footer padding; TechField error; LoginCard body */
|
||||
.panel-body { padding: 0.85rem 0.9rem; }
|
||||
@@ -395,14 +395,14 @@
|
||||
display: inline-block; min-width: 1.4rem; text-align: center;
|
||||
font-family: var(--mono); font-size: 0.72rem; font-weight: 600;
|
||||
padding: 0.05rem 0.35rem; border-radius: 999px;
|
||||
color: var(--bad); background: var(--bad-bg); border: 1px solid var(--bad-border);
|
||||
color: var(--bad-ink); background: var(--bad-bg); border: 1px solid var(--bad-border);
|
||||
}
|
||||
.count-badge.warn { color: var(--warn-ink); background: var(--warn-bg); border-color: var(--warn-border); }
|
||||
|
||||
/* ── Inline notice, info variant ─────────────────────────────────────────────
|
||||
Theme 0.3.1 ships `.notice` (amber) but no variants; `.info` re-tints it to
|
||||
the on-palette blue wash. `--info-bg`/`--info-border` come from the theme. */
|
||||
.notice.info { color: var(--accent-deep); background: var(--info-bg); border-color: var(--info-border); }
|
||||
.notice.info { color: var(--info-ink); background: var(--info-bg); border-color: var(--info-border); }
|
||||
|
||||
/* ── Table row-action cell ─────────────────────────────────────────────────
|
||||
The bare class is what the mockup ships and what a `<span class="row-actions">`
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
--card: #ffffff; /* raised surfaces: cards, bars, table heads */
|
||||
--ink: #1b1d21; /* primary text */
|
||||
--ink-soft: #5a6066; /* secondary text, labels */
|
||||
--ink-faint: #8b9097; /* tertiary text, captions, units */
|
||||
--ink-faint: #626970; /* tertiary text, captions, units */
|
||||
--rule: #e4e4df; /* hairline borders / row dividers */
|
||||
--rule-strong: #d2d2cb; /* emphasised hairlines: bar underline, pills */
|
||||
|
||||
@@ -50,13 +50,18 @@
|
||||
--accent: #2f5fd0; /* links, sort arrows, primary actions */
|
||||
--accent-deep: #1e3f99; /* hover / pressed accent, raw-value emphasis */
|
||||
|
||||
/* Status — foreground */
|
||||
/* Status — signals (dots, stripes and charts; use semantic inks for text) */
|
||||
--ok: #2f9e44;
|
||||
--warn: #e8920c;
|
||||
--bad: #e03131;
|
||||
--idle: #868e96;
|
||||
|
||||
/* Status — tinted backgrounds (pair with the matching foreground) */
|
||||
/* Status — readable text inks, paired with the matching tinted surface */
|
||||
--ok-ink: #236f34;
|
||||
--bad-ink: #b42121;
|
||||
--idle-ink: #535d66;
|
||||
|
||||
/* Status — tinted backgrounds (pair with the matching text ink) */
|
||||
--ok-bg: #e9f6ec;
|
||||
--warn-bg: #fdf1dd;
|
||||
--bad-bg: #fceaea;
|
||||
@@ -73,10 +78,11 @@
|
||||
|
||||
/* Warning ink — a deeper amber than --warn, for chip/notice/value text that
|
||||
needs more contrast on the warm tint than the pure --warn would give. */
|
||||
--warn-ink: #b56a00;
|
||||
--warn-ink: #855000;
|
||||
--warn-ink-deep: #8a5a00;
|
||||
|
||||
/* Info / accent tint — on-palette blue wash (StatusPill Info, dir-read tag) */
|
||||
--info-ink: #1e3f99; /* semantic blue, independent of product accent */
|
||||
--info-bg: #e7ecfb;
|
||||
--info-border: #cdd9f7;
|
||||
|
||||
@@ -165,21 +171,21 @@ a:hover { color: var(--accent-deep); text-decoration: underline; }
|
||||
width: 7px; height: 7px; border-radius: 50%;
|
||||
background: var(--idle);
|
||||
}
|
||||
.conn-pill[data-state="connected"] { color: var(--ok); border-color: var(--ok-border-soft); background: var(--ok-bg); }
|
||||
.conn-pill[data-state="connected"] { color: var(--ok-ink); border-color: var(--ok-border-soft); background: var(--ok-bg); }
|
||||
.conn-pill[data-state="connected"] .dot { background: var(--ok); }
|
||||
.conn-pill[data-state="connecting"] { color: var(--warn); border-color: var(--warn-border-soft); background: var(--warn-bg); }
|
||||
.conn-pill[data-state="connecting"] { color: var(--warn-ink); border-color: var(--warn-border-soft); background: var(--warn-bg); }
|
||||
.conn-pill[data-state="connecting"] .dot { background: var(--warn); animation: pulse 1.1s ease-in-out infinite; }
|
||||
.conn-pill[data-state="disconnected"] { color: var(--bad); border-color: var(--bad-border-soft); background: var(--bad-bg); }
|
||||
.conn-pill[data-state="disconnected"] { color: var(--bad-ink); border-color: var(--bad-border-soft); background: var(--bad-bg); }
|
||||
.conn-pill[data-state="disconnected"] .dot { background: var(--bad); }
|
||||
|
||||
@keyframes pulse { 0%,100% { opacity: 1; } 50% { opacity: 0.25; } }
|
||||
|
||||
/* ── Status text helpers ─────────────────────────────────────────────────────
|
||||
Recolour a value in place — counts, ratios, error totals. */
|
||||
.s-ok { color: var(--ok); }
|
||||
.s-warn { color: var(--warn); }
|
||||
.s-bad { color: var(--bad); }
|
||||
.s-idle { color: var(--idle); }
|
||||
.s-ok { color: var(--ok-ink); }
|
||||
.s-warn { color: var(--warn-ink); }
|
||||
.s-bad { color: var(--bad-ink); }
|
||||
.s-idle { color: var(--idle-ink); }
|
||||
|
||||
/* ── State chip ──────────────────────────────────────────────────────────────
|
||||
Compact rectangular badge for an enumerated state (bound/recovering/…).
|
||||
@@ -194,10 +200,10 @@ a:hover { color: var(--accent-deep); text-decoration: underline; }
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
.chip-ok { color: var(--ok); background: var(--ok-bg); border-color: var(--ok-border); }
|
||||
.chip-ok { color: var(--ok-ink); background: var(--ok-bg); border-color: var(--ok-border); }
|
||||
.chip-warn { color: var(--warn-ink); background: var(--warn-bg); border-color: var(--warn-border); }
|
||||
.chip-bad { color: var(--bad); background: var(--bad-bg); border-color: var(--bad-border); }
|
||||
.chip-idle { color: var(--idle); background: var(--idle-bg); border-color: var(--rule-strong); }
|
||||
.chip-bad { color: var(--bad-ink); background: var(--bad-bg); border-color: var(--bad-border); }
|
||||
.chip-idle { color: var(--idle-ink); background: var(--idle-bg); border-color: var(--rule-strong); }
|
||||
|
||||
/* ── Panel — the base raised surface ─────────────────────────────────────────
|
||||
A white card with a hairline border and 8px radius. .panel-head is the
|
||||
@@ -272,7 +278,7 @@ a:hover { color: var(--accent-deep); text-decoration: underline; }
|
||||
color: var(--ink-faint);
|
||||
}
|
||||
.agg-card.alert { border-color: var(--bad-border); background: var(--bad-bg); }
|
||||
.agg-card.alert .agg-value { color: var(--bad); }
|
||||
.agg-card.alert .agg-value { color: var(--bad-ink); }
|
||||
.agg-card.caution { border-color: var(--warn-border); background: var(--warn-bg); }
|
||||
.agg-card.caution .agg-value { color: var(--warn-ink); }
|
||||
|
||||
@@ -308,9 +314,9 @@ a:hover { color: var(--accent-deep); text-decoration: underline; }
|
||||
font-variant-numeric: tabular-nums;
|
||||
text-align: right;
|
||||
}
|
||||
.kv .v.warn { color: var(--warn); }
|
||||
.kv .v.bad { color: var(--bad); }
|
||||
.kv .v.ok { color: var(--ok); }
|
||||
.kv .v.warn { color: var(--warn-ink); }
|
||||
.kv .v.bad { color: var(--bad-ink); }
|
||||
.kv .v.ok { color: var(--ok-ink); }
|
||||
|
||||
/* ── Toolbar ─────────────────────────────────────────────────────────────────
|
||||
Filter/search row that sits inside a .panel above a table. */
|
||||
@@ -388,7 +394,7 @@ a:hover { color: var(--accent-deep); text-decoration: underline; }
|
||||
padding: 0.1rem 0.4rem;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.dir-read { color: var(--accent-deep); background: var(--info-bg); }
|
||||
.dir-read { color: var(--info-ink); background: var(--info-bg); }
|
||||
.dir-write { color: var(--warn-ink-deep); background: var(--warn-bg); }
|
||||
|
||||
/* ── Inline notice ───────────────────────────────────────────────────────────
|
||||
|
||||
@@ -102,11 +102,11 @@ public class StaticAssetsTests
|
||||
// Theme-002: .chip-idle pairs the idle background with the matching --idle
|
||||
// foreground token (per DESIGN-TOKENS.md), not --ink-soft.
|
||||
[Fact]
|
||||
public void ChipIdle_pairs_idle_foreground_with_idle_background()
|
||||
public void ChipIdle_pairs_readable_idle_ink_with_idle_background()
|
||||
{
|
||||
var css = File.ReadAllText(Path.Combine(Wwwroot, "css", "theme.css"));
|
||||
var rule = Regex.Match(css, @"\.chip-idle\s*\{[^}]*\}").Value;
|
||||
Assert.Contains("color: var(--idle)", rule);
|
||||
Assert.Contains("color: var(--idle-ink)", rule);
|
||||
Assert.Contains("background: var(--idle-bg)", rule);
|
||||
Assert.DoesNotContain("--ink-soft", rule);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
using System.Globalization;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace ZB.MOM.WW.Theme.Tests;
|
||||
|
||||
public sealed class ThemeTokenContrastTests
|
||||
{
|
||||
private static string Css => File.ReadAllText(Path.GetFullPath(Path.Combine(
|
||||
AppContext.BaseDirectory, "..", "..", "..", "..", "..",
|
||||
"src", "ZB.MOM.WW.Theme", "wwwroot", "css", "theme.css")));
|
||||
|
||||
private static string Token(string name)
|
||||
{
|
||||
var match = Regex.Match(Css, Regex.Escape(name) + @"\s*:\s*(#[0-9a-fA-F]{6})\s*;");
|
||||
Assert.True(match.Success, $"Missing hex token {name}");
|
||||
return match.Groups[1].Value;
|
||||
}
|
||||
|
||||
private static double Luminance(string hex)
|
||||
{
|
||||
double Channel(int start)
|
||||
{
|
||||
var value = int.Parse(hex.Substring(start, 2), NumberStyles.HexNumber,
|
||||
CultureInfo.InvariantCulture) / 255d;
|
||||
return value <= .04045 ? value / 12.92 : Math.Pow((value + .055) / 1.055, 2.4);
|
||||
}
|
||||
return .2126 * Channel(1) + .7152 * Channel(3) + .0722 * Channel(5);
|
||||
}
|
||||
|
||||
private static double Ratio(string a, string b)
|
||||
{
|
||||
var x = Luminance(a);
|
||||
var y = Luminance(b);
|
||||
return (Math.Max(x, y) + .05) / (Math.Min(x, y) + .05);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("--ok-ink", "--ok-bg")]
|
||||
[InlineData("--warn-ink", "--warn-bg")]
|
||||
[InlineData("--bad-ink", "--bad-bg")]
|
||||
[InlineData("--idle-ink", "--idle-bg")]
|
||||
[InlineData("--info-ink", "--info-bg")]
|
||||
[InlineData("--ink-faint", "--paper")]
|
||||
[InlineData("--ink-faint", "--card")]
|
||||
[InlineData("--ok-ink", "--paper")]
|
||||
[InlineData("--warn-ink", "--paper")]
|
||||
[InlineData("--bad-ink", "--paper")]
|
||||
[InlineData("--idle-ink", "--paper")]
|
||||
[InlineData("--ok-ink", "--card")]
|
||||
[InlineData("--warn-ink", "--card")]
|
||||
[InlineData("--bad-ink", "--card")]
|
||||
[InlineData("--idle-ink", "--card")]
|
||||
public void Small_text_pairs_meet_AA(string foreground, string background)
|
||||
{
|
||||
var ratio = Ratio(Token(foreground), Token(background));
|
||||
Assert.True(ratio >= 4.5, $"{foreground} on {background}: {ratio:F2}:1, requires 4.5:1");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Contrast_reference_is_black_on_white() =>
|
||||
Assert.Equal(21d, Ratio("#000000", "#ffffff"), 6);
|
||||
}
|
||||
Reference in New Issue
Block a user