Skip to content

Commit b406d21

Browse files
refactor(web): add a label variant to Badge
Pull request labels drove their colour through a --label custom property in className. Expose variant="label" (the color-mix recipe, driven by the --label style the consumer sets). The sidebar environment pill, the traits default badge and the keybinding source badge each hand-rolled a quieter or rounder badge; a badge has one radius and outline is the quiet one. Visible effect: pull request labels and the sidebar environment pill are rounded-sm instead of pills; the traits picker's Default badge and the keybinding source badge are standard sm outline badges. Lowers the no-restyle ceiling from 713 to 690. Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent ed1f26d commit b406d21

6 files changed

Lines changed: 10 additions & 16 deletions

File tree

‎apps/web/src/components/chat/TraitsPicker.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ const ULTRATHINK_PROMPT_PREFIX = "Ultrathink:\n";
9595

9696
function DefaultBadge() {
9797
return (
98-
<Badge
99-
variant="outline"
100-
className="inline-flex h-4 w-fit min-w-0 items-center justify-center gap-0 border-border/70 bg-muted/60 px-1.5 py-0 font-semibold text-[10px] text-muted-foreground leading-none sm:h-4"
101-
>
98+
<Badge variant="outline" size="sm" className="min-w-0">
10299
Default
103100
</Badge>
104101
);

‎apps/web/src/components/pullRequest/pullRequestPresentation.tsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,8 @@ export function PullRequestLabelChip({
5757
return (
5858
<Badge
5959
size={size}
60-
variant="secondary"
61-
className={cn(
62-
"min-w-0 max-w-40 shrink justify-start gap-1 rounded-full px-2",
63-
size === "sm" && "h-4 text-[.625rem]",
64-
color &&
65-
"bg-[color-mix(in_srgb,var(--label)_8%,transparent)] text-[color-mix(in_srgb,var(--label)_30%,var(--color-foreground))] dark:bg-[color-mix(in_srgb,var(--label)_12%,transparent)] dark:text-[color-mix(in_srgb,var(--label)_45%,var(--color-foreground))]",
66-
className,
67-
)}
60+
variant={color ? "label" : "secondary"}
61+
className={cn("min-w-0 max-w-40 shrink justify-start", className)}
6862
{...(color ? { style: { "--label": color } as CSSProperties } : {})}
6963
>
7064
<span className="truncate">{label.name}</span>
@@ -411,7 +405,7 @@ export function PullRequestReviewOutcomeBadge({
411405
}) {
412406
const presentation = REVIEW_OUTCOME_PRESENTATION[outcome];
413407
return (
414-
<Badge size="sm" variant={presentation.badgeVariant} className={cn("gap-1", className)}>
408+
<Badge size="sm" variant={presentation.badgeVariant} className={className}>
415409
<presentation.Icon aria-hidden className="size-3" />
416410
{presentation.label}
417411
</Badge>

‎apps/web/src/components/settings/KeybindingsSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ function KeybindingRowMenu({
977977
function KeybindingSourceBadge({ source }: { source: KeybindingRow["source"] }) {
978978
if (source === "Default") return null;
979979
return (
980-
<Badge variant="outline" size="sm" className="font-normal text-muted-foreground">
980+
<Badge variant="outline" size="sm">
981981
{source}
982982
</Badge>
983983
);

‎apps/web/src/components/sidebar/SidebarChrome.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const SidebarChromeHeader = memo(function SidebarChromeHeader({
6666
<SidebarBrand onBackdrop={backdropVariant !== null} />
6767
{pillLabel ? (
6868
<Badge
69-
className="relative z-10 ml-1 hidden rounded-full px-1.5 text-muted-foreground @[15rem]/sidebar-header:inline-flex"
69+
className="relative z-10 ml-1 hidden @[15rem]/sidebar-header:inline-flex"
7070
data-environment-identification="pill"
7171
size="sm"
7272
variant="secondary"

‎apps/web/src/components/ui/badge.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ const badgeVariants = cva(
3434
secondary: "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
3535
success: "bg-success/8 text-success-foreground dark:bg-success/16",
3636
warning: "bg-warning/8 text-warning-foreground dark:bg-warning/16",
37+
// A code-host label tinted from the --label color the consumer sets in style.
38+
label:
39+
"bg-[color-mix(in_srgb,var(--label)_8%,transparent)] text-[color-mix(in_srgb,var(--label)_30%,var(--color-foreground))] dark:bg-[color-mix(in_srgb,var(--label)_12%,transparent)] dark:text-[color-mix(in_srgb,var(--label)_45%,var(--color-foreground))]",
3740
},
3841
},
3942
},

‎scripts/lint-restyle-ceiling.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as NodeURL from "node:url";
88
// components/ui exports are migrated to variants (see vite.config.ts). This gate keeps the
99
// count from growing: CI fails when findings exceed the ceiling. Lower the ceiling when you
1010
// migrate a file, and delete this script when the rule becomes an error.
11-
export const RESTYLE_CEILING = 1031;
11+
export const RESTYLE_CEILING = 1008;
1212

1313
const RULE = "shadcn(no-restyle)";
1414

0 commit comments

Comments
 (0)