Skip to content

Commit 839b0cb

Browse files
authored
fix: updated component styling, homegrid + component preview bg with new greyscale tokens (#222)
* fix: updated component styling, homegrid + component preview bg with new greyscale tokens * chore: updated component registry
1 parent 0bd7e5c commit 839b0cb

File tree

10 files changed

+35
-28
lines changed

10 files changed

+35
-28
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@cloudflare/kumo-docs-astro": patch
3+
"@cloudflare/kumo": patch
4+
---
5+
6+
fix: update styling for mostly-used components with new greyscale tokens (combobox, dialog, input, layerCard, select & tabs) as well as homegrid and component preview backgrounds.

packages/kumo-docs-astro/src/components/demos/HomeGrid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ export function HomeGrid() {
601601
const route = componentRoutes[c.id] || null;
602602
return (
603603
<li
604-
className="relative flex aspect-square items-center justify-center bg-kumo-elevated"
604+
className="relative flex aspect-square items-center justify-center bg-kumo-surface"
605605
key={c.name}
606606
>
607607
{route ? (

packages/kumo-docs-astro/src/components/docs/ComponentPreview.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
<div
6-
class="flex min-h-[120px] items-center justify-center rounded-t-lg border border-kumo-line bg-kumo-base p-6"
6+
class="flex min-h-[120px] items-center justify-center rounded-t-lg border border-kumo-line bg-kumo-surface p-6"
77
>
88
<slot />
99
</div>

packages/kumo/ai/component-registry.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,9 +2130,10 @@
21302130
"<div className=\"flex flex-wrap items-center gap-4\">\n <Combobox\n size=\"sm\"\n value={smValue}\n onValueChange={(v) => setSmValue(v as Language)}\n items={languages}\n >\n <Combobox.TriggerValue className=\"w-[160px]\" />\n <Combobox.Content>\n <Combobox.Input placeholder=\"Search\" />\n <Combobox.Empty />\n <Combobox.List>\n {(item: Language) => (\n <Combobox.Item key={item.value} value={item}>\n {item.emoji} {item.label}\n </Combobox.Item>\n )}\n </Combobox.List>\n </Combobox.Content>\n </Combobox>\n <Combobox\n size=\"base\"\n value={baseValue}\n onValueChange={(v) => setBaseValue(v as Language)}\n items={languages}\n >\n <Combobox.TriggerValue className=\"w-[180px]\" />\n <Combobox.Content>\n <Combobox.Input placeholder=\"Search\" />\n <Combobox.Empty />\n <Combobox.List>\n {(item: Language) => (\n <Combobox.Item key={item.value} value={item}>\n {item.emoji} {item.label}\n </Combobox.Item>\n )}\n </Combobox.List>\n </Combobox.Content>\n </Combobox>\n </div>"
21312131
],
21322132
"colors": [
2133-
"bg-kumo-control",
2133+
"bg-kumo-base",
21342134
"bg-kumo-fill-hover",
21352135
"bg-kumo-overlay",
2136+
"bg-kumo-tint",
21362137
"border-kumo-line",
21372138
"ring-kumo-line",
21382139
"text-kumo-default",
@@ -2473,7 +2474,6 @@
24732474
],
24742475
"colors": [
24752476
"bg-kumo-base",
2476-
"bg-kumo-overlay",
24772477
"text-kumo-default"
24782478
],
24792479
"subComponents": {
@@ -3165,6 +3165,7 @@
31653165
"colors": [
31663166
"bg-kumo-base",
31673167
"bg-kumo-elevated",
3168+
"bg-kumo-recessed",
31683169
"ring-kumo-fill",
31693170
"ring-kumo-line",
31703171
"text-kumo-strong"
@@ -3896,9 +3897,8 @@
38963897
"<Select\n label=\"Author\"\n description=\"Select the primary author for this document\"\n className=\"w-[200px]\"\n onValueChange={(v) => setValue(v as (typeof authors)[0] | null)}\n value={value}\n isItemEqualToValue={(item, value) => item?.id === value?.id}\n renderValue={(author) => {\n return author?.name ?? \"Select an author\";\n }}\n >\n {authors.map((author) => (\n <Select.Option key={author.id} value={author}>\n <div className=\"flex w-[300px] items-center justify-between gap-2\">\n <Text>{author.name}</Text>\n <Text variant=\"secondary\">{author.title}</Text>\n </div>\n </Select.Option>\n ))}\n </Select>"
38973898
],
38983899
"colors": [
3899-
"bg-kumo-control",
3900-
"bg-kumo-overlay",
3901-
"ring-kumo-line",
3900+
"bg-kumo-base",
3901+
"bg-kumo-tint",
39023902
"ring-kumo-ring",
39033903
"text-kumo-danger",
39043904
"text-kumo-default",
@@ -4463,11 +4463,12 @@
44634463
"<Tabs\n tabs={[\n {\n value: \"tab1\",\n label: \"Regular Tab\",\n },\n {\n value: \"tab2\",\n label: \"Link Tab\",\n render: (props) => <a {...props} href=\"#tab2\" />,\n },\n {\n value: \"tab3\",\n label: \"Cloudflare\",\n render: (props) => (\n <a {...props} href=\"https://cloudflare.com\" target=\"_blank\" />\n ),\n },\n ]}\n selectedValue=\"tab1\"\n />"
44644464
],
44654465
"colors": [
4466+
"bg-kumo-base",
44664467
"bg-kumo-brand",
4467-
"bg-kumo-overlay",
4468+
"bg-kumo-recessed",
4469+
"bg-kumo-surface",
44684470
"bg-kumo-tint",
4469-
"border-kumo-line",
4470-
"ring-kumo-fill-hover",
4471+
"border-kumo-ring",
44714472
"ring-kumo-ring",
44724473
"text-kumo-default",
44734474
"text-kumo-strong",
@@ -5137,4 +5138,4 @@
51375138
]
51385139
}
51395140
}
5140-
}
5141+
}

packages/kumo/ai/component-registry.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ Combobox — autocomplete input with filterable dropdown list. Compound compone
12091209

12101210
**Colors (kumo tokens used):**
12111211

1212-
`bg-kumo-control`, `bg-kumo-fill-hover`, `bg-kumo-overlay`, `border-kumo-line`, `ring-kumo-line`, `text-kumo-default`, `text-kumo-strong`, `text-kumo-subtle`
1212+
`bg-kumo-base`, `bg-kumo-fill-hover`, `bg-kumo-overlay`, `bg-kumo-tint`, `border-kumo-line`, `ring-kumo-line`, `text-kumo-default`, `text-kumo-strong`, `text-kumo-subtle`
12131213

12141214
**Sub-Components:**
12151215

@@ -2035,7 +2035,7 @@ Dialog component
20352035

20362036
**Colors (kumo tokens used):**
20372037

2038-
`bg-kumo-base`, `bg-kumo-overlay`, `text-kumo-default`
2038+
`bg-kumo-base`, `text-kumo-default`
20392039

20402040
**Styling:**
20412041

@@ -3100,7 +3100,7 @@ LayerCard component
31003100

31013101
**Colors (kumo tokens used):**
31023102

3103-
`bg-kumo-base`, `bg-kumo-elevated`, `ring-kumo-fill`, `ring-kumo-line`, `text-kumo-strong`
3103+
`bg-kumo-base`, `bg-kumo-elevated`, `bg-kumo-recessed`, `ring-kumo-fill`, `ring-kumo-line`, `text-kumo-strong`
31043104

31053105
**Styling:**
31063106

@@ -4071,7 +4071,7 @@ Select component
40714071

40724072
**Colors (kumo tokens used):**
40734073

4074-
`bg-kumo-control`, `bg-kumo-overlay`, `ring-kumo-line`, `ring-kumo-ring`, `text-kumo-danger`, `text-kumo-default`, `text-kumo-subtle`
4074+
`bg-kumo-base`, `bg-kumo-tint`, `ring-kumo-ring`, `text-kumo-danger`, `text-kumo-default`, `text-kumo-subtle`
40754075

40764076
**Styling:**
40774077

@@ -4957,7 +4957,7 @@ Tab navigation component with segmented or underline style. Built on Base UI Tab
49574957

49584958
**Colors (kumo tokens used):**
49594959

4960-
`bg-kumo-brand`, `bg-kumo-overlay`, `bg-kumo-tint`, `border-kumo-line`, `ring-kumo-fill-hover`, `ring-kumo-ring`, `text-kumo-default`, `text-kumo-strong`, `text-kumo-subtle`
4960+
`bg-kumo-base`, `bg-kumo-brand`, `bg-kumo-recessed`, `bg-kumo-surface`, `bg-kumo-tint`, `border-kumo-ring`, `ring-kumo-ring`, `text-kumo-default`, `text-kumo-strong`, `text-kumo-subtle`
49614961

49624962
**Styling:**
49634963

packages/kumo/src/components/combobox/combobox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function Content({
210210
className={cn(
211211
"flex flex-col", // flexbox layout for sticky input + scrollable list
212212
"max-h-[min(var(--available-height),24rem)] max-w-(--available-width) min-w-(--anchor-width) py-1.5",
213-
"bg-kumo-control text-kumo-default", // background
213+
"bg-kumo-base text-kumo-default", // background
214214
"rounded-lg shadow-lg ring ring-kumo-line", // border part
215215
className,
216216
)}
@@ -333,7 +333,7 @@ function Item({ children, ...props }: ComboboxBase.Item.Props) {
333333
return (
334334
<ComboboxBase.Item
335335
{...props}
336-
className="group mx-1.5 grid cursor-pointer grid-cols-[1fr_16px] gap-2 rounded px-2 py-1.5 text-base data-highlighted:bg-kumo-overlay"
336+
className="group mx-1.5 grid cursor-pointer grid-cols-[1fr_16px] gap-2 rounded px-2 py-1.5 text-base data-highlighted:bg-kumo-tint"
337337
>
338338
<div className="col-start-1">{children}</div>
339339
<ComboboxBase.ItemIndicator className="col-start-2 flex items-center">

packages/kumo/src/components/dialog/dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ function DialogContent({
213213

214214
return (
215215
<BasePortal>
216-
<BaseBackdrop className="fixed inset-0 bg-kumo-overlay opacity-80 transition-all duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0" />
216+
<BaseBackdrop className="fixed inset-0 bg-kumo-base opacity-80 transition-all duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0" />
217217
<Surface
218218
as={BasePopup}
219219
className={cn(dialogVariants({ size }), className)}

packages/kumo/src/components/layer-card/layer-card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function LayerCardSecondary({ children, className }: LayerCardProps) {
5555
return (
5656
<div
5757
className={cn(
58-
"flex items-center gap-2 p-2 text-base font-medium text-kumo-strong",
58+
"flex items-center gap-2 p-2 text-base font-medium text-kumo-strong bg-kumo-recessed",
5959
className,
6060
)}
6161
>

packages/kumo/src/components/select/select.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ export function Select<T, Multiple extends boolean | undefined = false>({
296296
<SelectBase.Positioner>
297297
<SelectBase.Popup
298298
className={cn(
299-
"overflow-hidden bg-kumo-control text-kumo-default", // background
300-
"rounded-lg shadow-lg ring ring-kumo-line", // border part
299+
"overflow-hidden bg-kumo-base text-kumo-default", // background
300+
"rounded-lg shadow-lg ring ring-kumo-ring", // border part
301301
// 3px adjustment to account for padding + border differences
302302
"min-w-[calc(var(--anchor-width)+3px)] p-1.5", // spacing
303303
)}
@@ -370,7 +370,7 @@ function Option<T>({ children, value }: OptionProps<T>) {
370370
return (
371371
<SelectBase.Item
372372
value={value}
373-
className="group flex cursor-pointer items-center justify-between gap-2 rounded px-2 py-1.5 text-base data-highlighted:bg-kumo-overlay"
373+
className="group flex cursor-pointer items-center justify-between gap-2 rounded px-2 py-1.5 text-base data-highlighted:bg-kumo-tint"
374374
>
375375
<SelectBase.ItemText>{children}</SelectBase.ItemText>
376376
<SelectBase.ItemIndicator>

packages/kumo/src/components/tabs/tabs.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ export function Tabs({
151151
>
152152
{/* Background element for segmented variant */}
153153
{isSegmented && (
154-
<div className="absolute inset-x-0 top-1/2 z-0 h-8.5 -translate-y-1/2 rounded-lg bg-kumo-tint" />
154+
<div className="absolute inset-x-0 top-1/2 z-0 h-8.5 -translate-y-1/2 rounded-lg bg-kumo-surface" />
155155
)}
156156
<TabsPrimitive.List
157157
activateOnFocus={activateOnFocus}
158158
className={cn(
159159
"scrollbar-hide relative flex min-w-0 shrink items-stretch",
160-
isSegmented && "h-8.5 rounded-lg bg-kumo-tint px-px",
161-
isUnderline && "h-7 gap-4 border-b border-kumo-line pb-2",
160+
isSegmented && "h-8.5 rounded-lg bg-kumo-recessed px-px",
161+
isUnderline && "h-7 gap-4 border-b border-kumo-ring pb-2",
162162
listClassName,
163163
)}
164164
>
@@ -172,7 +172,7 @@ export function Tabs({
172172
isSegmented &&
173173
"my-px rounded-lg px-2.5 text-kumo-strong hover:text-kumo-default aria-selected:text-kumo-default focus-visible:ring-inset",
174174
isUnderline &&
175-
"px-2 py-2.5 text-kumo-strong hover:bg-kumo-tint/50 hover:text-kumo-subtle aria-selected:hover:bg-transparent aria-selected:font-medium aria-selected:text-kumo-default",
175+
"px-2 py-2.5 text-kumo-strong hover:bg-kumo-tint hover:text-kumo-subtle aria-selected:hover:bg-kumo-tint aria-selected:font-medium aria-selected:text-kumo-default",
176176
tab.className,
177177
)}
178178
>
@@ -185,7 +185,7 @@ export function Tabs({
185185
"data-[rendered=false]:scale-90 data-[rendered=false]:opacity-0",
186186
"left-(--active-tab-left) w-(--active-tab-width)",
187187
isSegmented &&
188-
"top-(--active-tab-top) h-(--active-tab-height) rounded-lg bg-kumo-overlay shadow-sm ring ring-kumo-fill-hover",
188+
"top-(--active-tab-top) h-(--active-tab-height) rounded-lg bg-kumo-base shadow-sm ring ring-kumo-ring",
189189
isUnderline && "bottom-0 h-0.5 bg-kumo-brand",
190190
indicatorClassName,
191191
)}

0 commit comments

Comments
 (0)