From 1a730659f0e1029257a5d26d7ec77e04e6c86ff3 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 14 Oct 2026 19:44:57 +0200 Subject: [PATCH 1/2] Add a design system: one set of tokens for the launcher, menus and website docs/design-system.md describes the new design language (after mkdir.directory: type as the interface, numbered index lists with hairline rules, one violet accent, space instead of borders, quiet motion, a faint wordmark) and its tokens, components, surfaces and mark. crates/horizon-theme now holds the whole system: the two palettes (cool neutrals, light and dark, each text colour checked against WCAG AA on every background by a test), the type scale with web sizes, spacing, radii, rules, control heights and motion with CSS easing curves. Instrument Serif is gone; display type is Geist at medium weight. `cargo run -p xtask -- tokens` writes website/src/tokens.css from the crate, and a test fails when the file is out of date. The launcher and the game's menus read the new names through small adapters; the restyles follow in their own changes. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/ui_theme.rs | 51 +- .../fonts/InstrumentSerif-Regular.ttf | Bin 70012 -> 0 bytes .../fonts/OFL-InstrumentSerif.txt | 93 ---- crates/horizon-theme/src/lib.rs | 502 +++++++++++++++--- docs/design-system.md | 158 ++++++ launcher/src/main.rs | 1 - launcher/src/theme.rs | 50 +- website/src/tokens.css | 121 +++++ xtask/Cargo.toml | 5 +- xtask/src/main.rs | 13 +- 10 files changed, 777 insertions(+), 217 deletions(-) delete mode 100644 crates/horizon-theme/fonts/InstrumentSerif-Regular.ttf delete mode 100644 crates/horizon-theme/fonts/OFL-InstrumentSerif.txt create mode 100644 docs/design-system.md create mode 100644 website/src/tokens.css diff --git a/crates/horizon-client/src/ui_theme.rs b/crates/horizon-client/src/ui_theme.rs index 39c6555d3..3b53c34fd 100644 --- a/crates/horizon-client/src/ui_theme.rs +++ b/crates/horizon-client/src/ui_theme.rs @@ -72,22 +72,22 @@ pub fn save_preferences(dir: &Path) { let _ = std::fs::write(dir.join("horizon.txt"), format!("menuStyle:{value}\n")); } -/// The launcher's dark palette (`horizon_theme::DARK`) in the HUD's colour -/// encoding, plus the translucent surfaces the menus put over the backdrop. +/// The dark palette (`horizon_theme::DARK`) in the HUD's colour encoding, plus the +/// translucent surfaces the menus put over the backdrop. pub mod color { use crate::hud::rgba; use horizon_theme::DARK as P; pub const fn hex(c: u32, a: u8) -> u32 { (a as u32) << 24 | (c & 0xff) << 16 | (c >> 8 & 0xff) << 8 | (c >> 16 & 0xff) } - pub const BG: u32 = hex(P.bg, 255); - pub const SIDEBAR: u32 = hex(P.sidebar, 255); - pub const RAISED: u32 = hex(P.raised, 255); - pub const HOVER: u32 = hex(P.hover, 255); - pub const BORDER: u32 = hex(P.border, 255); - pub const TEXT: u32 = hex(P.text, 255); - pub const MUTED: u32 = hex(P.muted, 255); - pub const FAINT: u32 = hex(P.faint, 255); + pub const BG: u32 = hex(P.page, 255); + pub const SIDEBAR: u32 = hex(P.plate_soft, 255); + pub const RAISED: u32 = hex(P.plate_soft, 255); + pub const HOVER: u32 = hex(P.plate, 255); + pub const BORDER: u32 = hex(P.rule, 255); + pub const TEXT: u32 = hex(P.ink, 255); + pub const MUTED: u32 = hex(P.ink_soft, 255); + pub const FAINT: u32 = hex(P.muted, 255); pub const ACCENT: u32 = hex(P.accent, 255); pub const ON_ACCENT: u32 = hex(P.on_accent, 255); pub const DANGER: u32 = hex(P.danger, 255); @@ -106,16 +106,25 @@ pub mod color { } /// The launcher's type scale and shapes (`horizon_theme`), in dp. -pub use horizon_theme::{ - BODY, CONTROL, CONTROL_LARGE, HERO, LARGE, RADIUS, RADIUS_CARD, RADIUS_GROUP, RADIUS_SEGMENT, - ROW_LABEL, SEGMENT, SIDEBAR, SMALL, TITLE, WORDMARK, ease_out_cubic, ease_out_quint, -}; +pub use horizon_theme::{CONTROL, CONTROL_LARGE, SEGMENT, ease_out_cubic, ease_out_quint}; +pub const SMALL: f32 = horizon_theme::CAPTION.px; +pub const BODY: f32 = horizon_theme::LABEL.px; +pub const LARGE: f32 = horizon_theme::BODY.px; +pub const TITLE: f32 = horizon_theme::TITLE.px; +pub const HERO: f32 = horizon_theme::DISPLAY.px; +pub const WORDMARK: f32 = 96.; +pub const RADIUS: f32 = horizon_theme::RADIUS; +pub const RADIUS_SEGMENT: f32 = horizon_theme::RADIUS; +pub const RADIUS_GROUP: f32 = horizon_theme::RADIUS; +pub const RADIUS_CARD: f32 = horizon_theme::RADIUS_PLATE; +pub const ROW_LABEL: f32 = 150.; +pub const SIDEBAR: f32 = 200.; /// Motion durations in seconds (`horizon_theme::QUICK` and `MOVE`). pub fn quick() -> f32 { - horizon_theme::QUICK.as_secs_f32() + horizon_theme::QUICK.secs() } pub fn move_() -> f32 { - horizon_theme::MOVE.as_secs_f32() + horizon_theme::MOVE.secs() } /// How visible the live title backdrop is (0..1), set by the game each frame. static BACKDROP: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); @@ -153,7 +162,7 @@ impl Fonts { let f = |b: &'static [u8]| FontRef::try_from_slice(b).expect("bundled font"); Self { faces: [ - f(horizon_theme::fonts::INSTRUMENT_SERIF), + f(horizon_theme::fonts::GEIST_MEDIUM), f(horizon_theme::fonts::GEIST_REGULAR), f(horizon_theme::fonts::GEIST_MEDIUM), f(horizon_theme::fonts::GEIST_SEMIBOLD), @@ -862,11 +871,7 @@ impl<'a> Ui<'a> { if !enabled { self.opacity *= horizon_theme::DISABLED; } else if self.pressed(x, y, w, h) { - self.opacity *= if kind == Kind::Primary { - horizon_theme::PRESSED - } else { - horizon_theme::PRESSED_SOFT - }; + self.opacity *= horizon_theme::PRESSED; } let fg = match kind { Kind::Primary => { @@ -877,7 +882,7 @@ impl<'a> Ui<'a> { w, h, RADIUS, - color::with_alpha(color::WHITE, horizon_theme::PRIMARY_HOVER * hover), + color::with_alpha(color::WHITE, 0.10 * hover), ); color::ON_ACCENT } diff --git a/crates/horizon-theme/fonts/InstrumentSerif-Regular.ttf b/crates/horizon-theme/fonts/InstrumentSerif-Regular.ttf deleted file mode 100644 index 36fac00ef9b7d523236df6536cb09c712bb2c7e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70012 zcmc${d0=E!nKyjSy|pj5s#0rGS!zkDDoJIl?0a?A?sO-eUP+*rEWIz#Y;A+sHVDX~ zxWFj5Anu5u)r}~k<0v`|Be?OZI4*!Q=&KHc4&&fPC-3h$_g1AUNjELuA78`Gy>;%X zTjxCI+0OI)&bf>;#$5QLW6sf`;gR4S6}uSw_En7Wj?u}DTfSU(+Q-;a4>FcMHo9fo zz%MSkZ#(0*QpWVVHg0K1&HSMB^Qe0_o-#9kboSVPeCf0Qmoekd@j%P`@vB1CA4rce zR`Ma-Z`pTj|IxYnzrC3;>u(rSZ2M=gJce>7e(wm*ru|2**?0JUUxKl+Z!z|fnFD)g z_k{bMIy@i0$J!2{!0;&lD?V?<=gI>|uR5_s3V#`&|BUv$c;vGA*_q$J{c-%>_ZgG^ zcy#u}G3ncmgSdYJ^+T7=9^HH5u6zCuWB*u*_MJI)*_BrvJ8)|WW8e4*e*QhjuGo9* zz{rzmYw;gZ|I>_UgQM>9>p#2O(euB|A*0=lJ#TsKB%NRA{NBRiHx{0feezH7(ZD1s z#Xo#Ues1C0_}hp3CuE;^l6p_Aa1E94YuNSp)=i+j#1d>Pdnaz*q1c#=yE^_U{%)p6 zKW>wzP`+M0^Ia^)>+&AO?qlpSd>+e|O>CSPW?yHaNRift=Xe|L-AVWPf&|L25R;{g z*`@qn7hk^6L$;vqbIi?OV2S02RK(o*2mfc(d%fdse89V{|>Wc4=KQW7jn=TNVl(YM3{&F0(4(~e3m(Q{_!pr;1_sEy{P*YrsrFj zf5q{yteoG)N+li6bUlwcuXlu)oxhhU1;>xkz8^Cad!9MeWARn?{Nnd;Jg-9aV#!~a|q9GkZLN?_S7p>*6cYwv`9Je(}%zJ&Uib zIA+n7{NpB!(S;tXjpNtQKROD>(1o$2W969Mj`7Poq^Fr(dKSme)Pw&5boeE%--Bl! zVG(`|vhg&lgdFO@FCKm+j$1*elQ`~Tm8j$5r$N8>vJ&{_p)AkzBuk?U3??TzlGz2IO=fN#rMb}$v8a1 zrqEd@zlzUupuC<%SOe>1C)vl@C)sCNhJArO%D%#l+|7eL%HzD2H}iJh$Jg?4ehHuD zd-+NJT`4HFOaCJMLe|M9*(MjsiSnDu?=AnIkSA0UDi1|Mu~1{EEA(JE5-D0-#BYT# z>Rm8XpM*vI9Dd`A>@oIF+`@gloX2<#ujg&Nlds`pe3I|td-x Vvj{ctZM#%w&UX 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 f32 { + (self.px * self.line).round() + } +} + +const fn step( + name: &'static str, + px: f32, + web: Web, + line: f32, + tracking: f32, + weight: u16, + mono: bool, +) -> Step { + Step { + name, + px, + web, + line, + tracking, + weight, + mono, + } +} + +/// Indices (`01`), counts and timestamps, in mono. +pub const MICRO: Step = step("micro", 11., Web::Fixed, 1.5, 0.04, 400, true); +/// Footnotes and help under a control. +pub const CAPTION: Step = step("caption", 12., Web::Fixed, 1.5, 0., 400, false); +/// Row labels, navigation and buttons. +pub const LABEL: Step = step("label", 13., Web::Fixed, 1.5, 0., 400, false); +/// Body text in the apps. +pub const UI: Step = step("ui", 14., Web::Fixed, 1.5, 0., 400, false); +/// Paragraphs. +pub const BODY: Step = step("body", 15., Web::Fluid(15., 17.), 1.6, 0., 400, false); +/// Section heads. +pub const HEADING: Step = step("heading", 20., Web::Fluid(20., 24.), 1.3, -0.01, 500, false); +/// The names in an index list. +pub const TITLE: Step = step("title", 28., Web::Fluid(32., 48.), 1.05, -0.02, 500, false); +/// Page titles. +pub const DISPLAY: Step = step( + "display", + 44., + Web::Fluid(34., 64.), + 1.05, + -0.025, + 500, + false, +); +/// The giant faint signature. +pub const WORDMARK: Step = step("wordmark", 220., Web::Viewport(18.), 0.8, -0.04, 500, false); + +pub const TYPE: [Step; 9] = [ + MICRO, CAPTION, LABEL, UI, BODY, HEADING, TITLE, DISPLAY, WORDMARK, +]; /// The spacing scale. -pub const SPACE: [f32; 6] = [4., 8., 12., 16., 24., 32.]; +pub const SPACE: [f32; 9] = [4., 8., 12., 16., 24., 32., 48., 64., 96.]; +/// Page margins: wide windows and pages, and phones. +pub const GUTTER: f32 = 64.; +pub const GUTTER_NARROW: f32 = 16.; +/// The longest paragraph line, in characters. +pub const MEASURE: f32 = 56.; -/// Corner radii: buttons, fields, nav items and rows; segments inside a -/// segmented control; the segmented control's frame; menus and cards. -pub const RADIUS: f32 = 6.; -pub const RADIUS_SEGMENT: f32 = 5.; -pub const RADIUS_GROUP: f32 = 7.; -pub const RADIUS_CARD: f32 = 8.; -/// Dividers and borders are one pixel. -pub const HAIRLINE: f32 = 1.; +/// Corner radii: fields and small controls; plates (hover rows, console, dialogs); pills +/// (buttons, segmented controls, switches). +pub const RADIUS: f32 = 8.; +pub const RADIUS_PLATE: f32 = 12.; +pub const RADIUS_PILL: f32 = 999.; +/// Rules between rows are one pixel; there are no other borders. +pub const RULE: f32 = 1.; -/// Control heights: buttons and nav items, segments, the large Play button. -pub const CONTROL: f32 = 30.; -pub const SEGMENT: f32 = 26.; +/// Heights: buttons, the one large action, a segment, a field, an index row in the apps and +/// on the web. +pub const CONTROL: f32 = 32.; pub const CONTROL_LARGE: f32 = 40.; -/// A pressed primary button's opacity (secondary and ghost: `PRESSED_SOFT`). -pub const PRESSED: f32 = 0.82; -pub const PRESSED_SOFT: f32 = 0.8; -/// Disabled controls' opacity. +pub const SEGMENT: f32 = 28.; +pub const FIELD: f32 = 36.; +pub const ROW: f32 = 64.; +pub const ROW_WEB: f32 = 86.; +/// The index column of a list (where `01` sits) and how far the hover plate reaches past a row. +pub const INDEX: f32 = 40.; +pub const PLATE_BLEED: f32 = 16.; +/// A pressed primary button's opacity, and disabled controls'. +pub const PRESSED: f32 = 0.85; pub const DISABLED: f32 = 0.4; -/// The hover layer of a primary button: white at this opacity. -pub const PRIMARY_HOVER: f32 = 0.10; -/// Sidebar width and the label column of settings rows. -pub const SIDEBAR: f32 = 200.; -pub const ROW_LABEL: f32 = 150.; -/// Motion: short and eased out, never bouncy. -pub const QUICK: Duration = Duration::from_millis(160); -pub const MOVE: Duration = Duration::from_millis(240); -/// The opening: the wordmark holds, then the interface appears. +/// A duration and its easing curve (CSS `cubic-bezier` control points). +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Motion { + pub name: &'static str, + pub ms: u64, + pub curve: [f32; 4], +} + +impl Motion { + pub const fn duration(&self) -> Duration { + Duration::from_millis(self.ms) + } + pub fn secs(&self) -> f32 { + self.ms as f32 / 1000. + } + /// The eased progress for a linear `t` in 0..1. + pub fn ease(&self, t: f32) -> f32 { + bezier(self.curve, t) + } +} + +/// Standard ease, for hovers, presses and colour. +pub const QUICK: Motion = Motion { + name: "quick", + ms: 150, + curve: [0.4, 0., 0.2, 1.], +}; +/// Ease-out with a long tail, for selection, switches and page changes. +pub const MOVE: Motion = Motion { + name: "move", + ms: 240, + curve: [0.23, 1., 0.32, 1.], +}; +/// Content arriving: a fade and a [`RISE`]. +pub const ENTER: Motion = Motion { + name: "enter", + ms: 600, + curve: [0.23, 1., 0.32, 1.], +}; +pub const MOTION: [Motion; 3] = [QUICK, MOVE, ENTER]; +/// The delay between list rows arriving, and how far content rises as it arrives. +pub const STAGGER: Duration = Duration::from_millis(40); +pub const RISE: f32 = 8.; + +/// The launcher's opening: the wordmark holds, then the interface arrives. pub const OPENING_HOLD: Duration = Duration::from_millis(1400); pub const OPENING_MAX: Duration = Duration::from_millis(2500); pub const OPENING_REVEAL: Duration = Duration::from_millis(800); -/// GPUI's `ease_out_quint`, used for hovers, the sliding selection and page changes. +/// A CSS `cubic-bezier(x1, y1, x2, y2)` at `t`: solves x for the curve parameter, returns y. +pub fn bezier([x1, y1, x2, y2]: [f32; 4], t: f32) -> f32 { + let t = t.clamp(0., 1.); + if t == 0. || t == 1. { + return t; + } + let at = |a: f32, b: f32, s: f32| { + let u = 1. - s; + 3. * u * u * s * a + 3. * u * s * s * b + s * s * s + }; + let (mut lo, mut hi) = (0f32, 1f32); + for _ in 0..24 { + let mid = (lo + hi) / 2.; + if at(x1, x2, mid) < t { + lo = mid; + } else { + hi = mid; + } + } + at(y1, y2, (lo + hi) / 2.) +} + pub fn ease_out_quint(t: f32) -> f32 { 1. - (1. - t.clamp(0., 1.)).powi(5) } @@ -75,46 +215,258 @@ pub fn ease_out_cubic(t: f32) -> f32 { #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct Palette { - pub bg: u32, - pub sidebar: u32, - pub raised: u32, - pub hover: u32, - pub border: u32, - pub text: u32, + /// The background. + pub page: u32, + /// The hover plate, fields, the segmented track, the console. + pub plate_soft: u32, + /// Pressed plates, a switch that is off, the faint wordmark. + pub plate: u32, + /// Dialogs and menus above the page. + pub surface: u32, + /// One-pixel rules between rows, slider and progress tracks. + pub rule: u32, + /// Text, selection, the slider's fill. + pub ink: u32, + /// Secondary text and values. + pub ink_soft: u32, + /// Labels, descriptions, indices. pub muted: u32, - pub faint: u32, + /// The main action, links, focus, progress. pub accent: u32, pub on_accent: u32, pub danger: u32, + pub success: u32, pub dark: bool, } -pub const DARK: Palette = Palette { - bg: 0x111113, - sidebar: 0x0c0c0d, - raised: 0x1a1a1d, - hover: 0x202024, - border: 0x26262a, - text: 0xe8e8ea, - muted: 0x9a9aa1, - faint: 0x626269, - accent: 0x7c5cc4, +pub const LIGHT: Palette = Palette { + page: 0xfafafc, + plate_soft: 0xf3f3f8, + plate: 0xebecf4, + surface: 0xffffff, + rule: 0xe2e3ea, + ink: 0x16181f, + ink_soft: 0x3b3e49, + muted: 0x646875, + accent: 0x5b3fd6, on_accent: 0xffffff, - danger: 0xd9705f, + danger: 0xb4372a, + success: 0x1d7a48, + dark: false, +}; + +pub const DARK: Palette = Palette { + page: 0x0d0e13, + plate_soft: 0x181a22, + plate: 0x20222c, + surface: 0x16181f, + rule: 0x24262f, + ink: 0xecedf3, + ink_soft: 0xc5c7d1, + muted: 0x8b8f9c, + accent: 0x9a86ff, + on_accent: 0x0d0e13, + danger: 0xf07a68, + success: 0x45c27a, dark: true, }; -pub const LIGHT: Palette = Palette { - bg: 0xfcfcfb, - sidebar: 0xf4f4f2, - raised: 0xf2f2f0, - hover: 0xebebe8, - border: 0xe3e3df, - text: 0x19191b, - muted: 0x63636a, - faint: 0x9a9a9f, - accent: 0x6a4bb3, - on_accent: 0xffffff, - danger: 0xb84a3a, - dark: false, -}; +/// How strongly the game's menus veil the live title backdrop with the page colour. +pub const VEIL: f32 = 0.86; + +impl Palette { + /// Every colour with its token name, in the order the docs list them. + pub fn named(&self) -> [(&'static str, u32); 12] { + [ + ("page", self.page), + ("plate-soft", self.plate_soft), + ("plate", self.plate), + ("surface", self.surface), + ("rule", self.rule), + ("ink", self.ink), + ("ink-soft", self.ink_soft), + ("muted", self.muted), + ("accent", self.accent), + ("on-accent", self.on_accent), + ("danger", self.danger), + ("success", self.success), + ] + } +} + +/// The WCAG 2 contrast ratio of two colours. +pub fn contrast(a: u32, b: u32) -> f32 { + fn luminance(c: u32) -> f32 { + let ch = |s: u32| { + let v = ((c >> s) & 255) as f32 / 255.; + if v <= 0.03928 { + v / 12.92 + } else { + ((v + 0.055) / 1.055).powf(2.4) + } + }; + 0.2126 * ch(16) + 0.7152 * ch(8) + 0.0722 * ch(0) + } + let (x, y) = (luminance(a), luminance(b)); + (x.max(y) + 0.05) / (x.min(y) + 0.05) +} + +/// `website/src/tokens.css`: every token as a CSS custom property, the light palette by +/// default, the dark one when the system asks for it or the page sets `data-theme="dark"`. +pub fn css() -> String { + let mut s = String::new(); + let num = |v: f32| { + let t = format!("{v:.3}"); + t.trim_end_matches('0').trim_end_matches('.').to_string() + }; + let colors = |s: &mut String, p: &Palette| { + for (name, c) in p.named() { + let _ = writeln!(s, " --{name}: #{c:06x};"); + } + let _ = writeln!( + s, + " color-scheme: {};", + if p.dark { "dark" } else { "light" } + ); + }; + s.push_str( + "/* Generated from crates/horizon-theme by `cargo run -p xtask -- tokens`; do not edit.\n \ + docs/design-system.md describes the tokens. */\n\n:root {\n", + ); + colors(&mut s, &LIGHT); + let _ = writeln!( + s, + " --font: \"{FONT}\", ui-sans-serif, system-ui, sans-serif;\n --mono: \"{MONO}\", ui-monospace, monospace;" + ); + for step in TYPE { + let size = match step.web { + Web::Fixed => format!("{}px", num(step.px)), + Web::Fluid(min, max) => format!( + "clamp({}px, calc({}px + {} * (100vw - 375px) / 1065), {}px)", + num(min), + num(min), + num(max - min), + num(max) + ), + Web::Viewport(vw) => format!("{}vw", num(vw)), + }; + let n = step.name; + let _ = writeln!(s, " --text-{n}: {size};"); + let _ = writeln!(s, " --text-{n}-line: {};", num(step.line)); + let _ = writeln!(s, " --text-{n}-tracking: {}em;", num(step.tracking)); + let _ = writeln!(s, " --text-{n}-weight: {};", step.weight); + } + for (i, v) in SPACE.iter().enumerate() { + let _ = writeln!(s, " --space-{}: {}px;", i + 1, num(*v)); + } + for (name, v) in [ + ("gutter", GUTTER), + ("gutter-narrow", GUTTER_NARROW), + ("radius", RADIUS), + ("radius-plate", RADIUS_PLATE), + ("radius-pill", RADIUS_PILL), + ("rule-width", RULE), + ("control", CONTROL), + ("control-large", CONTROL_LARGE), + ("segment", SEGMENT), + ("field", FIELD), + ("row", ROW_WEB), + ("index", INDEX), + ("plate-bleed", PLATE_BLEED), + ("rise", RISE), + ] { + let _ = writeln!(s, " --{name}: {}px;", num(v)); + } + let _ = writeln!(s, " --measure: {}ch;", num(MEASURE)); + for m in MOTION { + let [a, b, c, d] = m.curve; + let _ = writeln!(s, " --{}: {}ms;", m.name, m.ms); + let _ = writeln!( + s, + " --ease-{}: cubic-bezier({}, {}, {}, {});", + m.name, + num(a), + num(b), + num(c), + num(d) + ); + } + let _ = writeln!(s, " --stagger: {}ms;", STAGGER.as_millis()); + s.push_str( + "}\n\n@media (prefers-color-scheme: dark) {\n :root:not([data-theme=\"light\"]) {\n", + ); + let mut dark = String::new(); + colors(&mut dark, &DARK); + for line in dark.lines() { + let _ = writeln!(s, " {line}"); + } + s.push_str(" }\n}\n\n:root[data-theme=\"dark\"] {\n"); + s.push_str(&dark); + s.push_str("}\n"); + s +} + +#[cfg(test)] +mod tests { + use super::*; + + /// Every text colour on every background it is drawn on reaches WCAG AA (4.5:1). + #[test] + fn text_meets_wcag_aa_in_both_palettes() { + for p in [LIGHT, DARK] { + let backgrounds = [ + ("page", p.page), + ("plate_soft", p.plate_soft), + ("plate", p.plate), + ("surface", p.surface), + ]; + let texts = [ + ("ink", p.ink), + ("ink_soft", p.ink_soft), + ("muted", p.muted), + ("accent", p.accent), + ("danger", p.danger), + ("success", p.success), + ]; + for (bn, bg) in backgrounds { + for (tn, fg) in texts { + let ratio = contrast(fg, bg); + assert!( + ratio >= 4.5, + "{} {tn} on {bn}: {ratio:.2}", + if p.dark { "dark" } else { "light" } + ); + } + } + // Text on the accent, and page-coloured text on an ink segment. + assert!(contrast(p.on_accent, p.accent) >= 4.5); + assert!(contrast(p.page, p.ink) >= 4.5); + } + } + + #[test] + fn contrast_matches_known_values() { + assert!((contrast(0x000000, 0xffffff) - 21.).abs() < 0.01); + assert!((contrast(0x777777, 0xffffff) - 4.48).abs() < 0.01); + } + + #[test] + fn bezier_eases_out() { + assert_eq!(bezier(MOVE.curve, 0.), 0.); + assert!((bezier(MOVE.curve, 1.) - 1.).abs() < 1e-4); + assert!(MOVE.ease(0.25) > 0.6, "{}", MOVE.ease(0.25)); + assert!((bezier([0., 0., 1., 1.], 0.3) - 0.3).abs() < 1e-3); + } + + /// `website/src/tokens.css` is what [`css`] writes; regenerate it with + /// `cargo run -p xtask -- tokens`. + #[test] + fn website_tokens_are_up_to_date() { + let path = concat!(env!("CARGO_MANIFEST_DIR"), "/../../website/src/tokens.css"); + let written = std::fs::read_to_string(path).unwrap_or_default(); + assert!( + written == css(), + "website/src/tokens.css is out of date: run `cargo run -p xtask -- tokens`" + ); + } +} diff --git a/docs/design-system.md b/docs/design-system.md new file mode 100644 index 000000000..d61aff351 --- /dev/null +++ b/docs/design-system.md @@ -0,0 +1,158 @@ +# Horizon's design system + +One design language for the launcher, the website and the game's own menus (what "Menu style: +Horizon" draws). Vanilla's classic screens and the HUD are not part of it: they stay exactly +vanilla, because parity is the point of the game. + +The tokens live in one place, `crates/horizon-theme`. The launcher (`launcher/src/theme.rs`) +and the game (`crates/horizon-client/src/ui_theme.rs`) read them as Rust constants, and the +website reads them as CSS custom properties generated from the same crate +(`cargo run -p xtask -- tokens` writes `website/src/tokens.css`; a test fails when the file is +out of date). Change a value in the crate and all three follow. + +## Where it comes from + +The direction was set by [mkdir.directory](https://mkdir.directory/), a directory site that is +almost nothing but type. What we take from it is its restraint rather than its content: + +1. **Type is the interface.** One family, Geist, and its mono. Large, tight display type + (medium weight, -2 % tracking) carries the hierarchy, so there is no need for boxes, icons or + colour to say what matters. Instrument Serif is gone. +2. **Lists, not cards.** Content is a numbered list: a small mono index on the left (`01`, + `02`…), the name large, a mono detail on the right, and a 1 px rule between rows. Versions, + settings, worlds, servers, release notes and the parity table are all this one component. +3. **One accent, used once.** Neutrals do the work. The violet marks the single main action on a + screen (Play, Download), focus, links and progress; selection is shown in ink, not in colour. +4. **Space instead of borders.** Generous margins (64 px on wide screens, 16 px on phones), no + shadows, no gradients, no outlines around groups. A surface tint appears only under the + pointer or behind something that must stand apart (a console, a dialog). +5. **Quiet motion.** Things arrive with a short fade and an 8 px rise, a few tens of + milliseconds apart, eased out, never bouncy. Hovers fade a soft plate in behind the row. +6. **A signature.** A giant, faint wordmark: at the foot of the website, behind the launcher's + opening and the game's title screen. + +## Tokens + +### Colour + +Cool, slightly blue neutrals in two appearances with the same restraint, and Horizon's violet. +Every text colour passes WCAG AA (4.5:1) on every background it is used on; the tests in +`horizon-theme` check each pair in both palettes. + +| Token | Light | Dark | Use | +|--------------|-----------|-----------|-----| +| `page` | `#fafafc` | `#0d0e13` | the background | +| `plate_soft` | `#f3f3f8` | `#181a22` | hover plate, fields, segmented track, console | +| `plate` | `#ebecf4` | `#20222c` | pressed plate, switch off, the faint wordmark | +| `surface` | `#ffffff` | `#16181f` | dialogs and menus that sit above the page | +| `rule` | `#e2e3ea` | `#24262f` | 1 px rules between rows, tracks | +| `ink` | `#16181f` | `#ecedf3` | text, selection, slider fill, the inverted segment | +| `ink_soft` | `#3b3e49` | `#c5c7d1` | secondary text, values | +| `muted` | `#646875` | `#8b8f9c` | labels, descriptions, mono indices and details | +| `accent` | `#5b3fd6` | `#9a86ff` | the main action, links, focus, progress | +| `on_accent` | `#ffffff` | `#0d0e13` | text on the accent | +| `danger` | `#b4372a` | `#f07a68` | errors, the crash notice's dot | +| `success` | `#1d7a48` | `#45c27a` | "Matches vanilla", "Ready" | + +The game's menus draw over the live title backdrop, always in the dark palette, with the page +colour as a veil (`VEIL`, 0.86) so text keeps its contrast whatever the world shows. + +### Type + +Geist (400, 500, 600) and Geist Mono (400), bundled under the SIL Open Font License. + +| Token | App px | Web (min–max px) | Line | Tracking | Weight | Use | +|------------|--------|------------------|------|----------|--------|-----| +| `micro` | 11 | 11 | 1.5 | +0.04em | mono | indices (`01`), counts, timestamps | +| `caption` | 12 | 12 | 1.5 | 0 | 400 | footnotes, help under a control | +| `label` | 13 | 13 | 1.5 | 0 | 400 | row labels, nav, buttons | +| `ui` | 14 | 14 | 1.5 | 0 | 400 | body text in the apps | +| `body` | 15 | 15–17 | 1.6 | 0 | 400 | paragraphs | +| `heading` | 20 | 20–24 | 1.3 | -0.01em | 500 | section heads | +| `title` | 28 | 32–48 | 1.05 | -0.02em | 500 | list item names | +| `display` | 44 | 34–64 | 1.05 | -0.025em | 500 | page titles | +| `wordmark` | 220 | 18vw | 0.8 | -0.04em | 500 | the faint signature | + +### Space, shape and lines + +- Spacing scale: 4, 8, 12, 16, 24, 32, 48, 64, 96. Page gutter 64 (apps and wide web), 16 on + phones. Text measure at most 56 characters for paragraphs. +- Radii: 8 for fields and small controls, 12 for plates (hover rows, console, dialogs), full for + buttons, segmented controls and switches. +- Lines: 1 px, `rule`. No other borders. +- Heights: control 32, large control (Play) 40, segment 28, list row 64 (apps), 86 (web). + +### Motion + +| Token | Duration | Easing | Use | +|---------|----------|---------------------------------|-----| +| `quick` | 150 ms | `cubic-bezier(.4, 0, .2, 1)` | hovers, presses, colour | +| `move` | 240 ms | `cubic-bezier(.23, 1, .32, 1)` | selection sliding, switches, page changes | +| `enter` | 600 ms | `cubic-bezier(.23, 1, .32, 1)` | content arriving: opacity 0→1, rise 8 px | +| `stagger` | 40 ms | | delay between list rows arriving | + +`prefers-reduced-motion` (web) turns `enter` into a plain fade. + +## Components + +- **Index list** (the signature): `micro` mono index in `muted` (left, 40 px column), the name + in `title` (or `ui`/`label` for dense lists such as settings), details in `micro` mono + `muted` on the right, a `rule` under every row. Hover: a `plate_soft` plate with radius 12 + fades in, extending 16 px past the row on each side, and the index turns `ink`. +- **Buttons**: pill shaped, `label` size, medium weight, 32 high (40 for the one large action). + *Primary* is accent with `on_accent` text, at most one per screen. *Secondary* is + `plate_soft` with `ink` text. *Ghost* is `muted` text that turns `ink` with a `plate_soft` + plate under the pointer. Pressed: `plate` (or the accent at 85 %). Disabled: 40 % opacity. +- **Fields**: 36 high, `plate_soft`, radius 8, no border; focus draws a 1 px accent ring. + Monospace for paths and commands. +- **Switch**: 36×20 pill, `plate` when off, accent when on, a white 16 px knob that slides over + `move`. +- **Slider**: a 2 px `rule` track, the filled part `ink`, a 14 px `ink` knob. The value is + written in mono beside the label, not on the track. +- **Segmented control / tabs**: a `plate_soft` pill; the selected segment is an `ink` pill with + `page` text that slides over `move`. +- **Navigation**: text only. Launcher: a top bar with the mark and "Horizon" on the left and + the pages on the right, `label` size, `muted`, the current one `ink`. Game menus keep their + sidebar layout (it suits a controller), but as a plain column of text items on the page + colour, the current one in `ink` with a 2 px accent tick, no pill and no separate panel tint. +- **Page header**: `display` title, then one `body` line in `muted`, 56 characters at most. +- **Notices and dialogs**: a `plate_soft` plate, radius 12, 16–24 padding, no border; a 6 px dot + in `danger` (or `accent`) leads the title. Actions are buttons in a row below. +- **Progress**: a 2 px `rule` track and an `accent` fill; indeterminate work shuttles a 30 % + segment. +- **Console**: `plate_soft` plate, radius 12, `micro`/`caption` mono in `ink_soft`, newest line + at the bottom, the command field inside the plate under a `rule`. +- **Empty states**: a short `muted` sentence and one secondary button, centred in the space. + +## Surfaces + +- **Launcher** (`launcher/`): top bar; Play is a page header (version as the title, its notes' + first line under it), the client/server segmented control, the version picker and Play, then + an index list of Resources, Minecraft folder (and the server rows). Versions and Patch notes + are index lists with the release name as the title; Settings is an index list of switches and + values. The opening is the faint wordmark drawn letter by letter, then the interface arrives. + The sunset photograph is gone: the window is the page colour, light or dark with the system. +- **Website** (`website/`): the same page structure as before (what it is, screenshots, + parity, launcher, patch notes, community), each section a `micro` mono label, a `display` + heading and a short paragraph, its content an index list. Screenshots stay as images (radius + 12, no frame). Light and dark follow the system, with a toggle. A giant faint wordmark sits + above the footer. No hero photograph: the first screen is the headline, one paragraph, the + download button and the parity score as an index row. +- **Game menus** (Horizon style): the title backdrop under a page-colour veil; text sidebar; + index lists for worlds and servers; options pages as index lists of rows (label left, value + in mono, the control right). The pause menu is a centred column of plain rows over a darker + veil. + +## The mark + +**Horizon line.** A sun half set below a horizon, drawn as three horizontal bars of 4, 8 and +10 units over a 12 unit line, on a 16 unit grid. The bars are the sun cut by the horizon into +slices, which also reads as layers of terrain and as a nod to voxels without drawing a block. It +is built on whole units of the 16 px grid so it stays sharp at 16 px, and it scales without +detail to 1024 px. + +- Monochrome: the mark in `ink` on light, in `ink` (dark) on dark; the line can take the accent. +- App icon: the mark in `#ecedf3` with the line in `#9a86ff`, on a `#16181f` rounded square + (macOS grid: 824 px tile with 185 px corners in a 1024 canvas; Windows and Linux use the full + square with 22 % corners). +- Exports and where they go: `docs/media/brand/README.md`. diff --git a/launcher/src/main.rs b/launcher/src/main.rs index 5a486f6ea..bbbbc5b53 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -2701,7 +2701,6 @@ fn main() { Cow::Borrowed(horizon_theme::fonts::GEIST_MEDIUM), Cow::Borrowed(horizon_theme::fonts::GEIST_SEMIBOLD), Cow::Borrowed(horizon_theme::fonts::GEIST_MONO), - Cow::Borrowed(horizon_theme::fonts::INSTRUMENT_SERIF), ]) .expect("bundled fonts"); let bounds = Bounds::centered(None, size(px(1040.), px(700.)), cx); diff --git a/launcher/src/theme.rs b/launcher/src/theme.rs index 08f8741d7..20f276951 100644 --- a/launcher/src/theme.rs +++ b/launcher/src/theme.rs @@ -1,29 +1,33 @@ -//! The launcher's view of Horizon's design tokens (`crates/horizon-theme`), which the game's -//! menus share: one neutral palette in two appearances and one accent, spacing 4/8/12/16/24/32, -//! Geist / Instrument Serif / Geist Mono (bundled, SIL Open Font License), five sizes. +//! The launcher's view of Horizon's design tokens (`crates/horizon-theme`, described in +//! `docs/design-system.md`), which the game's menus and the website share: cool neutrals in two +//! appearances and one violet accent, Geist and Geist Mono (bundled, SIL Open Font License). use gpui::{rgb, Hsla, WindowAppearance}; use horizon_theme as tokens; use std::time::Duration; pub const FONT: &str = tokens::FONT; -pub const DISPLAY: &str = tokens::DISPLAY; +/// Display type is Geist too, at medium weight. +pub const DISPLAY: &str = tokens::FONT; pub const MONO: &str = tokens::MONO; -pub const SMALL: f32 = tokens::SMALL; -pub const BODY: f32 = tokens::BODY; -pub const LARGE: f32 = tokens::LARGE; -pub const TITLE: f32 = tokens::TITLE; -pub const HERO: f32 = tokens::HERO; +pub const SMALL: f32 = tokens::CAPTION.px; +pub const BODY: f32 = tokens::LABEL.px; +pub const LARGE: f32 = tokens::BODY.px; +pub const TITLE: f32 = tokens::TITLE.px; +pub const HERO: f32 = tokens::DISPLAY.px; /// Shapes and controls, shared with the game's menus. -pub use tokens::{ - CONTROL, DISABLED, PRESSED, PRESSED_SOFT, PRIMARY_HOVER, RADIUS, RADIUS_GROUP, RADIUS_SEGMENT, - ROW_LABEL, SEGMENT, SIDEBAR, -}; +pub use tokens::{CONTROL, DISABLED, PRESSED, RADIUS, SEGMENT}; +pub const PRESSED_SOFT: f32 = tokens::PRESSED; +pub const PRIMARY_HOVER: f32 = 0.10; +pub const RADIUS_SEGMENT: f32 = tokens::RADIUS; +pub const RADIUS_GROUP: f32 = tokens::RADIUS; +pub const ROW_LABEL: f32 = 150.; +pub const SIDEBAR: f32 = 200.; /// Motion: short and eased out, never bouncy. -pub const QUICK: Duration = tokens::QUICK; -pub const MOVE: Duration = tokens::MOVE; +pub const QUICK: Duration = tokens::QUICK.duration(); +pub const MOVE: Duration = tokens::MOVE.duration(); #[derive(Clone, Copy)] pub struct Theme { @@ -63,14 +67,14 @@ impl Theme { fn from(p: tokens::Palette) -> Self { Self { - bg: c(p.bg), - sidebar: c(p.sidebar), - raised: c(p.raised), - hover: c(p.hover), - border: c(p.border), - text: c(p.text), - muted: c(p.muted), - faint: c(p.faint), + bg: c(p.page), + sidebar: c(p.plate_soft), + raised: c(p.plate_soft), + hover: c(p.plate), + border: c(p.rule), + text: c(p.ink), + muted: c(p.ink_soft), + faint: c(p.muted), accent: c(p.accent), on_accent: c(p.on_accent), danger: c(p.danger), diff --git a/website/src/tokens.css b/website/src/tokens.css new file mode 100644 index 000000000..d272865cc --- /dev/null +++ b/website/src/tokens.css @@ -0,0 +1,121 @@ +/* Generated from crates/horizon-theme by `cargo run -p xtask -- tokens`; do not edit. + docs/design-system.md describes the tokens. */ + +:root { + --page: #fafafc; + --plate-soft: #f3f3f8; + --plate: #ebecf4; + --surface: #ffffff; + --rule: #e2e3ea; + --ink: #16181f; + --ink-soft: #3b3e49; + --muted: #646875; + --accent: #5b3fd6; + --on-accent: #ffffff; + --danger: #b4372a; + --success: #1d7a48; + color-scheme: light; + --font: "Geist", ui-sans-serif, system-ui, sans-serif; + --mono: "Geist Mono", ui-monospace, monospace; + --text-micro: 11px; + --text-micro-line: 1.5; + --text-micro-tracking: 0.04em; + --text-micro-weight: 400; + --text-caption: 12px; + --text-caption-line: 1.5; + --text-caption-tracking: 0em; + --text-caption-weight: 400; + --text-label: 13px; + --text-label-line: 1.5; + --text-label-tracking: 0em; + --text-label-weight: 400; + --text-ui: 14px; + --text-ui-line: 1.5; + --text-ui-tracking: 0em; + --text-ui-weight: 400; + --text-body: clamp(15px, calc(15px + 2 * (100vw - 375px) / 1065), 17px); + --text-body-line: 1.6; + --text-body-tracking: 0em; + --text-body-weight: 400; + --text-heading: clamp(20px, calc(20px + 4 * (100vw - 375px) / 1065), 24px); + --text-heading-line: 1.3; + --text-heading-tracking: -0.01em; + --text-heading-weight: 500; + --text-title: clamp(32px, calc(32px + 16 * (100vw - 375px) / 1065), 48px); + --text-title-line: 1.05; + --text-title-tracking: -0.02em; + --text-title-weight: 500; + --text-display: clamp(34px, calc(34px + 30 * (100vw - 375px) / 1065), 64px); + --text-display-line: 1.05; + --text-display-tracking: -0.025em; + --text-display-weight: 500; + --text-wordmark: 18vw; + --text-wordmark-line: 0.8; + --text-wordmark-tracking: -0.04em; + --text-wordmark-weight: 500; + --space-1: 4px; + --space-2: 8px; + --space-3: 12px; + --space-4: 16px; + --space-5: 24px; + --space-6: 32px; + --space-7: 48px; + --space-8: 64px; + --space-9: 96px; + --gutter: 64px; + --gutter-narrow: 16px; + --radius: 8px; + --radius-plate: 12px; + --radius-pill: 999px; + --rule-width: 1px; + --control: 32px; + --control-large: 40px; + --segment: 28px; + --field: 36px; + --row: 86px; + --index: 40px; + --plate-bleed: 16px; + --rise: 8px; + --measure: 56ch; + --quick: 150ms; + --ease-quick: cubic-bezier(0.4, 0, 0.2, 1); + --move: 240ms; + --ease-move: cubic-bezier(0.23, 1, 0.32, 1); + --enter: 600ms; + --ease-enter: cubic-bezier(0.23, 1, 0.32, 1); + --stagger: 40ms; +} + +@media (prefers-color-scheme: dark) { + :root:not([data-theme="light"]) { + --page: #0d0e13; + --plate-soft: #181a22; + --plate: #20222c; + --surface: #16181f; + --rule: #24262f; + --ink: #ecedf3; + --ink-soft: #c5c7d1; + --muted: #8b8f9c; + --accent: #9a86ff; + --on-accent: #0d0e13; + --danger: #f07a68; + --success: #45c27a; + color-scheme: dark; + } +} + +:root[data-theme="dark"] { + --page: #0d0e13; + --plate-soft: #181a22; + --plate: #20222c; + --surface: #16181f; + --rule: #24262f; + --ink: #ecedf3; + --ink-soft: #c5c7d1; + --muted: #8b8f9c; + --accent: #9a86ff; + --on-accent: #0d0e13; + --danger: #f07a68; + --success: #45c27a; + color-scheme: dark; +} diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 9c84fa59b..de1a0ecab 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -4,7 +4,10 @@ version = "0.1.0" edition.workspace = true license.workspace = true publish = false -description = "Repository tasks: cargo run -p xtask -- package BINARY OUTDIR" +description = "Repository tasks: cargo run -p xtask -- package BINARY OUTDIR | tokens" + +[dependencies] +horizon-theme = { path = "../crates/horizon-theme" } [lints] workspace = true diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3b6b6a1ce..6f54fa132 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -5,12 +5,15 @@ //! horizon-prepare), the exporters horizon-prepare compiles, its sources (the launcher compares //! them to its own), and PLAY.txt. It holds none of Minecraft's files: players prepare those //! from their own copy. .github/workflows/release.yml makes the release folders with it. +//! +//! `tokens`: writes `website/src/tokens.css`, the design tokens of `crates/horizon-theme` as CSS +//! custom properties (a horizon-theme test fails when the file is out of date). use std::fs; use std::path::{Component, Path, PathBuf}; use std::process::{Command, ExitCode}; -const USAGE: &str = "usage: cargo run -p xtask -- package BINARY OUTDIR"; +const USAGE: &str = "usage: cargo run -p xtask -- package BINARY OUTDIR | tokens"; /// What the release folder takes from the repository at HEAD, as `git archive` writes it. const ARCHIVED: [&str; 5] = [ @@ -30,6 +33,7 @@ fn main() -> ExitCode { let args: Vec = std::env::args().skip(1).collect(); let result = match args.as_slice() { [task, binary, out] if task == "package" => package(Path::new(binary), Path::new(out)), + [task] if task == "tokens" => tokens(), _ => Err(USAGE.to_string()), }; match result { @@ -58,6 +62,13 @@ fn git(repo: &Path, args: &[&str]) -> Result, String> { Ok(output.stdout) } +fn tokens() -> Result<(), String> { + let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("../website/src/tokens.css"); + fs::write(&path, horizon_theme::css()).map_err(|e| format!("{}: {e}", path.display()))?; + println!("wrote website/src/tokens.css"); + Ok(()) +} + fn package(binary: &Path, out: &Path) -> Result<(), String> { let top = git( Path::new(env!("CARGO_MANIFEST_DIR")), From 7d26cb0a5b997794cdb20ef4781fd9acce915b7f Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 14 Oct 2026 22:24:07 +0200 Subject: [PATCH 2/2] Hold the game menus' text to AA over the brightest backdrops The veil goes to 0.90 (0.80 on the title's home page, which keeps to ink and ink_soft), and muted text over the backdrop is lifted to #9fa3ae; a test checks every pair over a backdrop of luminance 0.77 (the snowiest title panorama measured reaches 0.49), bare and on a row's plate. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-theme/src/lib.rs | 44 +++++++++++++++++++++++++++++++-- docs/design-system.md | 6 ++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/crates/horizon-theme/src/lib.rs b/crates/horizon-theme/src/lib.rs index ec54a3699..3ed778c7f 100644 --- a/crates/horizon-theme/src/lib.rs +++ b/crates/horizon-theme/src/lib.rs @@ -271,8 +271,18 @@ pub const DARK: Palette = Palette { dark: true, }; -/// How strongly the game's menus veil the live title backdrop with the page colour. -pub const VEIL: f32 = 0.86; +/// How strongly the game's menus veil the live backdrop (the title panorama, or the world behind +/// the pause and options screens) with the page colour. Every text colour the menus use keeps +/// WCAG AA over it, even on a selected row's plate, with a backdrop as bright as +/// [`BRIGHT_BACKDROP`] (a test checks it). +pub const VEIL: f32 = 0.90; +/// The title's home page shows more of the world; its text is `ink` and `ink_soft` only. +pub const HOME_VEIL: f32 = 0.80; +/// Muted text over the veiled backdrop: the dark palette's `muted`, lifted so it holds AA there. +pub const BACKDROP_MUTED: u32 = 0x9fa3ae; +/// The brightest backdrop the veils are measured against: a light grey of luminance 0.77, +/// brighter than the snowiest title panorama measured (0.49) and a sunlit world. +pub const BRIGHT_BACKDROP: u32 = 0xe3e3e3; impl Palette { /// Every colour with its token name, in the order the docs list them. @@ -444,6 +454,36 @@ mod tests { } } + /// The game's menus over the brightest backdrop: the page colour veiled over it, and a + /// selected row's plate (ink at 8 %) on top. + #[test] + fn menu_text_meets_wcag_aa_over_a_bright_backdrop() { + let mix = |a: u32, b: u32, t: f32| { + [16, 8, 0].iter().fold(0, |out, s| { + let (x, y) = (((a >> s) & 255) as f32, ((b >> s) & 255) as f32); + out | ((x * (1. - t) + y * t).round() as u32) << s + }) + }; + let p = DARK; + for (veil, texts) in [ + ( + VEIL, + &[p.ink, p.ink_soft, BACKDROP_MUTED, p.danger, p.success][..], + ), + (HOME_VEIL, &[p.ink, p.ink_soft][..]), + ] { + let bg = mix(BRIGHT_BACKDROP, p.page, veil); + let plate = mix(bg, p.ink, 0.08); + for &text in texts { + for under in [bg, plate] { + let ratio = contrast(text, under); + assert!(ratio >= 4.5, "#{text:06x} over veil {veil}: {ratio:.2}"); + } + } + } + assert!(contrast(BACKDROP_MUTED, p.page) >= 4.5); + } + #[test] fn contrast_matches_known_values() { assert!((contrast(0x000000, 0xffffff) - 21.).abs() < 0.01); diff --git a/docs/design-system.md b/docs/design-system.md index d61aff351..7a93fb806 100644 --- a/docs/design-system.md +++ b/docs/design-system.md @@ -55,7 +55,11 @@ Every text colour passes WCAG AA (4.5:1) on every background it is used on; the | `success` | `#1d7a48` | `#45c27a` | "Matches vanilla", "Ready" | The game's menus draw over the live title backdrop, always in the dark palette, with the page -colour as a veil (`VEIL`, 0.86) so text keeps its contrast whatever the world shows. +colour as a flat veil so text keeps its contrast whatever the world shows: `VEIL` (0.90) on +every page and in a world, `HOME_VEIL` (0.80) on the title's home page, which shows more of the +world and keeps to `ink` and `ink_soft`. Muted text over the backdrop is `BACKDROP_MUTED` +(`#9fa3ae`). A test holds every pair to AA over a backdrop of luminance 0.77 (the snowiest title +panorama measured reaches 0.49), on the bare veil and on a selected row's plate. ### Type