refactor(ui): address /code-review on .btn-primary — tone family + doc fixes
- Generalize the recipe into a .btn-{tone} family: add .btn-danger / .btn-warn
siblings sharing one hover-dim, and migrate the two hand-rolled tone-action
buttons (ConfirmProvider danger confirm, Banner warning action) onto them, so
primary/danger/warn action paints can't drift.
- Reword the recipe comment: it owns paint + one standard hover-dim (not
'PAINT-ONLY' — that mislabel obscured the hover behaviour).
- Drop the now-redundant hover:opacity-90 from Banner's action-button base (each
tone's recipe supplies the hover).
The 3 previously hover-less primary buttons keep the standard hover-dim gained in
the prior commit (intentional consistency; now accurately documented). Gate green
(tsc/eslint-0/prettier/knip/vitest 79); self-E2E confirmed btn-danger/btn-warn
compute to their tone/tone-fg tokens.
This commit is contained in:
@@ -13,7 +13,7 @@ const TONES: Record<BannerTone, { bar: string; icon: string; action: string }> =
|
||||
warning: {
|
||||
bar: "bg-warn/15 border-warn/30",
|
||||
icon: "text-warn",
|
||||
action: "bg-warn text-warn-fg hover:opacity-90",
|
||||
action: "btn-warn",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ export default function Banner({
|
||||
{action && (
|
||||
<button
|
||||
onClick={action.onClick}
|
||||
className={`ml-1 px-2.5 py-1 rounded-lg font-semibold hover:opacity-90 transition ${c.action}`}
|
||||
className={`ml-1 px-2.5 py-1 rounded-lg font-semibold transition ${c.action}`}
|
||||
>
|
||||
{action.label}
|
||||
</button>
|
||||
|
||||
@@ -116,7 +116,7 @@ export function ConfirmProvider({ children }: { children: ReactNode }) {
|
||||
onClick={() => close(c.id)}
|
||||
className={`px-4 py-2 rounded-lg text-sm font-semibold transition ${
|
||||
multi ? "w-full" : ""
|
||||
} ${c.danger ? "bg-danger text-danger-fg hover:opacity-90" : "btn-primary"}`}
|
||||
} ${c.danger ? "btn-danger" : "btn-primary"}`}
|
||||
>
|
||||
{c.label || t("common.confirm")}
|
||||
</button>
|
||||
|
||||
+17
-6
@@ -496,16 +496,27 @@ body {
|
||||
color: var(--accent-fg);
|
||||
border-color: var(--accent);
|
||||
}
|
||||
/* .btn-primary — the primary/ACTION button paint (solid accent). Distinct from the selection
|
||||
recipes above: this is "the primary action", not "selected among options". PAINT-ONLY like
|
||||
.chip-solid — a site keeps its own geometry (padding/radius/font/gap/disabled:opacity/transition).
|
||||
Migrated sites MUST drop `bg-accent text-accent-fg hover:opacity-90` so this @layer-components
|
||||
rule isn't beaten by those utilities. No focus-visible — @layer base already rings every button. */
|
||||
/* .btn-{tone} — solid ACTION-button paint (the "primary/danger/warn action", distinct from the
|
||||
selection recipes above which are "selected among options"). Each sets its tone fill + contrasting
|
||||
fg; all share ONE standard hover-dim. Like .chip-solid this owns paint (+ that single hover
|
||||
behaviour), NOT geometry — a site keeps its own padding/radius/font/gap/disabled:opacity/shadow.
|
||||
Migrated sites MUST drop `bg-{tone} text-{tone}-fg hover:opacity-90` so these @layer-components
|
||||
rules aren't beaten by those utilities. No focus-visible — @layer base already rings every button. */
|
||||
.btn-primary {
|
||||
background-color: var(--accent);
|
||||
color: var(--accent-fg);
|
||||
}
|
||||
.btn-primary:hover:not(:disabled) {
|
||||
.btn-danger {
|
||||
background-color: var(--danger);
|
||||
color: var(--danger-fg);
|
||||
}
|
||||
.btn-warn {
|
||||
background-color: var(--warn);
|
||||
color: var(--warn-fg);
|
||||
}
|
||||
.btn-primary:hover:not(:disabled),
|
||||
.btn-danger:hover:not(:disabled),
|
||||
.btn-warn:hover:not(:disabled) {
|
||||
opacity: 0.9;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user