From 3daa0e218e756096b2ef7169096df414a26035b9 Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 29 Jun 2026 19:47:33 +0200 Subject: [PATCH] chore(eidos): fold color-picker neutral hovers into the --state-* layer color-picker.css is clean (committed in 72e8fb57), so the deferred color-picker fold is unblocked. The trigger + eye-dropper neutral hovers move from bespoke --color-picker-{trigger,eye-dropper}-hover-bg to the shared state layer: background: var(--color-picker-trigger-hover-bg) -> background-image: linear-gradient(var(--state-hover), var(--state-hover)) The trigger is filled (--color-picker-trigger-bg base), so the tint overlays via background-image (not background, which would replace the base). Kept the border-color / text-color hover shifts. Removed the 2 now-orphan recipe tokens + regenerated base.css. Leaves tabs as the only neutral component still on a bespoke hover (blocked by the other session's tabs.css WIP). Verified: color-picker hover tokens gone from base.css; color-picker.css uses --state-hover x2; eidos suite 15 failed (pre-existing, unchanged) / 255 passed. --- src/uix/eidos/components/color-picker/color-picker.css | 4 ++-- src/uix/eidos/generated/base.css | 2 -- src/uix/eidos/lib/recipes/base.ts | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/uix/eidos/components/color-picker/color-picker.css b/src/uix/eidos/components/color-picker/color-picker.css index 264b7a48e..da99ccd5c 100644 --- a/src/uix/eidos/components/color-picker/color-picker.css +++ b/src/uix/eidos/components/color-picker/color-picker.css @@ -161,7 +161,7 @@ } [data-color-picker-trigger]:hover:not([data-disabled]) { - background: var(--color-picker-trigger-hover-bg); + background-image: linear-gradient(var(--state-hover), var(--state-hover)); border-color: var(--color-picker-trigger-hover-border); } @@ -577,7 +577,7 @@ } [data-color-picker-eye-dropper]:hover:not([data-disabled]):not([data-unsupported]) { - background: var(--color-picker-eye-dropper-hover-bg); + background-image: linear-gradient(var(--state-hover), var(--state-hover)); color: var(--color-picker-eye-dropper-hover-color); } diff --git a/src/uix/eidos/generated/base.css b/src/uix/eidos/generated/base.css index 315b50aef..8fb6738a5 100644 --- a/src/uix/eidos/generated/base.css +++ b/src/uix/eidos/generated/base.css @@ -1520,7 +1520,6 @@ --color-picker-trigger-border: var(--color-border-default); --color-picker-trigger-bg: var(--color-surface-default); --color-picker-trigger-color: var(--color-content-primary); - --color-picker-trigger-hover-bg: var(--color-surface-overlay); --color-picker-trigger-hover-border: var(--color-border-strong); --color-picker-trigger-swatch-size-sm: calc(var(--control-height-sm) - var(--space-2)); --color-picker-trigger-swatch-size-md: calc(var(--control-height-md) - var(--space-2)); @@ -1548,7 +1547,6 @@ --color-picker-eye-dropper-radius: var(--radius-md); --color-picker-eye-dropper-bg: transparent; --color-picker-eye-dropper-color: var(--color-content-secondary); - --color-picker-eye-dropper-hover-bg: var(--color-surface-overlay); --color-picker-eye-dropper-hover-color: var(--color-content-primary); --color-picker-hue-0: hsl(0, 100%, 50%); --color-picker-hue-60: hsl(60, 100%, 50%); diff --git a/src/uix/eidos/lib/recipes/base.ts b/src/uix/eidos/lib/recipes/base.ts index 67ef40e42..532f1638c 100644 --- a/src/uix/eidos/lib/recipes/base.ts +++ b/src/uix/eidos/lib/recipes/base.ts @@ -1402,7 +1402,6 @@ export const THEME_BASE_RECIPE_TOKENS = { 'trigger-border': 'var(--color-border-default)', 'trigger-bg': 'var(--color-surface-default)', 'trigger-color': 'var(--color-content-primary)', - 'trigger-hover-bg': 'var(--color-surface-overlay)', 'trigger-hover-border': 'var(--color-border-strong)', 'trigger-swatch-size-sm': 'calc(var(--control-height-sm) - var(--space-2))', 'trigger-swatch-size-md': 'calc(var(--control-height-md) - var(--space-2))', @@ -1445,7 +1444,6 @@ export const THEME_BASE_RECIPE_TOKENS = { 'eye-dropper-radius': 'var(--radius-md)', 'eye-dropper-bg': 'transparent', 'eye-dropper-color': 'var(--color-content-secondary)', - 'eye-dropper-hover-bg': 'var(--color-surface-overlay)', 'eye-dropper-hover-color': 'var(--color-content-primary)', // Hue spectrum — drives the hue ring + saturation overlay. These