diff --git a/scripts/check-design-system.ts b/scripts/check-design-system.ts index c3ef2b39..49121683 100644 --- a/scripts/check-design-system.ts +++ b/scripts/check-design-system.ts @@ -51,6 +51,12 @@ for (const { file, source } of cssSources) { failures.push(`${file} uses undefined token ${match[1]}`); } } + // UI-02. Hue-based spaces interpolate the hue angle, and an achromatic + // stop such as oklch(1 0 0) carries hue 0: 14% blue into white came out + // pink. oklab mixes on straight lines and has no hue to drag. + for (const match of source.matchAll(/color-mix\(\s*in\s+(oklch|lch|hsl|hwb)\b/g)) { + failures.push(`${file} mixes colours in ${match[1]}; use oklab`); + } } const semanticSource = await readFile(tokenFiles.semantic, "utf8"); diff --git a/src/presentation/design-system/tokens/component.css b/src/presentation/design-system/tokens/component.css index 49f6daa1..c8e3a17c 100644 --- a/src/presentation/design-system/tokens/component.css +++ b/src/presentation/design-system/tokens/component.css @@ -6,7 +6,7 @@ --field-border-invalid: var(--color-danger); --dialog-elevation: var(--elevation-dialog); --navigation-active-background: color-mix( - in oklch, + in oklab, var(--color-action) 14%, var(--color-panel) ); diff --git a/src/presentation/design-system/tokens/semantic.css b/src/presentation/design-system/tokens/semantic.css index 19174cff..d494ba71 100644 --- a/src/presentation/design-system/tokens/semantic.css +++ b/src/presentation/design-system/tokens/semantic.css @@ -15,7 +15,7 @@ --color-danger-hover: var(--palette-red-700); --color-on-action: var(--palette-white); --color-focus: oklch(0.52 0.15 230); - --color-disabled-content: color-mix(in oklch, var(--color-content) 55%, transparent); + --color-disabled-content: color-mix(in oklab, var(--color-content) 55%, transparent); --color-disabled-surface: var(--color-surface-muted); --color-info-content: oklch(0.38 0.16 255); --color-info-surface: oklch(0.95 0.03 255); @@ -66,7 +66,7 @@ --color-danger-hover: oklch(0.76 0.16 25); --color-on-action: var(--palette-slate-950); --color-focus: oklch(0.82 0.15 220); - --color-disabled-content: color-mix(in oklch, var(--color-content) 55%, transparent); + --color-disabled-content: color-mix(in oklab, var(--color-content) 55%, transparent); --color-disabled-surface: var(--color-surface-muted); --color-info-content: oklch(0.83 0.09 250); --color-info-surface: oklch(0.27 0.045 255); diff --git a/src/presentation/styles/theme/pages.css b/src/presentation/styles/theme/pages.css index 7d118b71..dc8c79c4 100644 --- a/src/presentation/styles/theme/pages.css +++ b/src/presentation/styles/theme/pages.css @@ -135,7 +135,7 @@ .token-swatch__color { height: 4rem; - border: 1px solid color-mix(in oklch, var(--color-content) 15%, transparent); + border: 1px solid color-mix(in oklab, var(--color-content) 15%, transparent); border-radius: calc(var(--radius-control) / 1.5); } @@ -157,7 +157,7 @@ padding: 0.65rem 1rem; color: var(--color-content); background: var(--color-panel); - box-shadow: 0 8px 28px color-mix(in oklch, var(--color-content) 10%, transparent); + box-shadow: 0 8px 28px color-mix(in oklab, var(--color-content) 10%, transparent); font-size: 0.875rem; font-weight: 650; } diff --git a/src/presentation/styles/theme/primitives.css b/src/presentation/styles/theme/primitives.css index 92f73d56..cfe29c31 100644 --- a/src/presentation/styles/theme/primitives.css +++ b/src/presentation/styles/theme/primitives.css @@ -160,7 +160,7 @@ min-height: 2.75rem; box-sizing: border-box; border: 1px solid - color-mix(in oklch, var(--color-content-muted) 55%, var(--color-panel)); + color-mix(in oklab, var(--color-content-muted) 55%, var(--color-panel)); border-radius: var(--radius-control); padding: 0.65rem 0.8rem; color: var(--color-content); @@ -283,7 +283,7 @@ border-radius: var(--radius-surface); padding: 1.25rem; background: var(--color-panel); - box-shadow: 0 8px 28px color-mix(in oklch, var(--color-content) 6%, transparent); + box-shadow: 0 8px 28px color-mix(in oklab, var(--color-content) 6%, transparent); } .ui-card__header :is(h2, h3, h4), @@ -367,7 +367,7 @@ .ui-alert__dismiss:hover, .ui-dialog__close:hover { - background: color-mix(in oklch, var(--color-content) 8%, transparent); + background: color-mix(in oklab, var(--color-content) 8%, transparent); } .ui-badge { @@ -414,7 +414,7 @@ } .ui-dialog::backdrop { - background: color-mix(in oklch, var(--color-content) 55%, transparent); + background: color-mix(in oklab, var(--color-content) 55%, transparent); backdrop-filter: blur(2px); } diff --git a/src/presentation/styles/theme/responsive.css b/src/presentation/styles/theme/responsive.css index 0f07bb6a..72502316 100644 --- a/src/presentation/styles/theme/responsive.css +++ b/src/presentation/styles/theme/responsive.css @@ -24,7 +24,7 @@ width: min(18rem, 85vw); height: auto; box-sizing: border-box; - box-shadow: 10px 0 30px color-mix(in oklch, var(--color-content) 15%, transparent); + box-shadow: 10px 0 30px color-mix(in oklab, var(--color-content) 15%, transparent); } .app-shell__sidebar[data-open="true"] { @@ -37,7 +37,7 @@ inset: 4.5rem 0 0; display: block; border: 0; - background: color-mix(in oklch, var(--color-content) 35%, transparent); + background: color-mix(in oklab, var(--color-content) 35%, transparent); cursor: pointer; } diff --git a/src/presentation/styles/theme/shell.css b/src/presentation/styles/theme/shell.css index c3398a66..71bf0779 100644 --- a/src/presentation/styles/theme/shell.css +++ b/src/presentation/styles/theme/shell.css @@ -53,8 +53,8 @@ min-width: 0; padding: 0.75rem 1.25rem; border-bottom: 1px solid var(--color-surface-muted); - background: color-mix(in oklch, var(--color-panel) 92%, var(--color-surface)); - box-shadow: 0 1px 8px color-mix(in oklch, var(--color-content) 8%, transparent); + background: color-mix(in oklab, var(--color-panel) 92%, var(--color-surface)); + box-shadow: 0 1px 8px color-mix(in oklab, var(--color-content) 8%, transparent); } .app-shell__brand { @@ -181,7 +181,7 @@ .app-navigation__link.is-active { color: var(--color-action-hover); background: color-mix( - in oklch, + in oklab, var(--color-action) 14%, var(--color-panel) ); diff --git a/src/presentation/styles/theme/templates.css b/src/presentation/styles/theme/templates.css index 66c5646b..98141de3 100644 --- a/src/presentation/styles/theme/templates.css +++ b/src/presentation/styles/theme/templates.css @@ -143,7 +143,7 @@ z-index: 10; bottom: 0; padding: 0.75rem; - background: color-mix(in oklch, var(--color-panel) 94%, transparent); + background: color-mix(in oklab, var(--color-panel) 94%, transparent); } .status-page {