An open source design system that's fully customizable and agent ready
TypeScript
feat(docsite): per-theme showcase content + theme polish (Matcha/Butter/Stone/Y2K/Gothic) (#2856)
rubyycheunga7dc0931e544
diff --git a/apps/docsite/public/theme-butter-picker.png b/apps/docsite/public/theme-butter-picker.pngdeleted file mode 100644index 486e6788c1..0000000000Binary files a/apps/docsite/public/theme-butter-picker.png and /dev/null differdiff --git a/apps/docsite/public/theme-gothic-picker.png b/apps/docsite/public/theme-gothic-picker.pngdeleted file mode 100644index 826253a43e..0000000000Binary files a/apps/docsite/public/theme-gothic-picker.png and /dev/null differdiff --git a/apps/docsite/public/theme-matcha-picker.png b/apps/docsite/public/theme-matcha-picker.pngdeleted file mode 100644index 51b011c1e2..0000000000Binary files a/apps/docsite/public/theme-matcha-picker.png and /dev/null differdiff --git a/apps/docsite/public/theme-neutral-picker.png b/apps/docsite/public/theme-neutral-picker.pngdeleted file mode 100644index b88cddfa74..0000000000Binary files a/apps/docsite/public/theme-neutral-picker.png and /dev/null differdiff --git a/apps/docsite/public/theme-stone-picker.png b/apps/docsite/public/theme-stone-picker.pngdeleted file mode 100644index 8d5f6cb117..0000000000Binary files a/apps/docsite/public/theme-stone-picker.png and /dev/null differdiff --git a/apps/docsite/public/theme-y2k-picker.png b/apps/docsite/public/theme-y2k-picker.pngdeleted file mode 100644index 21153ae063..0000000000Binary files a/apps/docsite/public/theme-y2k-picker.png and /dev/null differdiff --git a/apps/docsite/src/app/layout.tsx b/apps/docsite/src/app/layout.tsxindex d8695093f5..52b8006073 100644--- a/apps/docsite/src/app/layout.tsx+++ b/apps/docsite/src/app/layout.tsx@@ -33,7 +33,7 @@ export default function RootLayout({children}: {children: React.ReactNode}) {/><linkrel="stylesheet"- href="https://fonts.googleapis.com/css2?family=Albert+Sans:wght@400;500;600;700&family=DM+Sans:wght@400;500;600;700&family=Figtree:wght@400;500;600;700&family=Fraunces:opsz,[email protected],400;9..144,500;9..144,600;9..144,700&family=Fustat:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600;700&family=Manufacturing+Consent&family=Montserrat:wght@400;500;600;700&family=Outfit:wght@400;500;600;700&family=PT+Serif:wght@400;700&family=Playwrite+US+Trad:[email protected]&family=Poppins:wght@400;500;600;700&family=Sarina&family=UnifrakturMaguntia&display=swap"+ href="https://fonts.googleapis.com/css2?family=Albert+Sans:wght@400;500;600;700&family=Crimson+Text:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&family=DM+Sans:wght@400;500;600;700&family=Figtree:wght@400;500;600;700&family=Fraunces:opsz,[email protected],400;9..144,500;9..144,600;9..144,700&family=Fustat:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600;700&family=Manufacturing+Consent&family=Montserrat:wght@400;500;600;700&family=Outfit:wght@400;500;600;700&family=PT+Serif:wght@400;700&family=Playwrite+US+Trad:[email protected]&family=Poppins:wght@400;500;600;700&family=Sarina&family=UnifrakturMaguntia&display=swap"/></head><body>diff --git a/apps/docsite/src/components/ThemePackagePage.tsx b/apps/docsite/src/components/ThemePackagePage.tsxindex ba84a93f06..3c5b16c230 100644--- a/apps/docsite/src/components/ThemePackagePage.tsx+++ b/apps/docsite/src/components/ThemePackagePage.tsx@@ -18,7 +18,8 @@ import {XDSLink} from '@xds/core/Link';import {XDSSelectableCard} from '@xds/core/SelectableCard';import {XDSSelector} from '@xds/core/Selector';import {XDSDivider} from '@xds/core/Divider';-import ThemeShowcase from '../../../../packages/cli/templates/pages/theme-showcase/page';+import {ThemeShowcaseStore} from '../../../../packages/cli/templates/pages/theme-showcase/page';+import {getThemeShowcaseContent} from './themeShowcaseContent';import {buildPlaygroundHref} from './playgroundLink';import {packages} from '../generated/packageRegistry';import {themeObjects} from '../generated/themeRegistry';@@ -31,6 +32,10 @@ import {trackOpenPlayground, trackToggle} from '../lib/analytics';const THEME_SHOWCASE_SOURCE =templates.find(t => t.slug === 'theme-showcase')?.source ?? '';+// CDN host for the per-theme picker banners (same host as the showcase+// product photos), so the artwork can be updated without a code change.+const PICKER_CDN = 'https://lookaside.facebook.com/assets/xds_oss';+// Gallery order — themes are listed in the same canonical visual-// closeness order used elsewhere (most restrained → most expressive).// Lives here so the sidebar's theme list reads in the same order as@@ -240,50 +245,51 @@ const styles = stylex.create({// Per-theme bespoke picker artwork — one rule per theme that// has a custom photo (vs. the multi-radial-gradient default).// Each rule sets the picker card's background to a dedicated- // /theme-<slug>-picker.png image. These are SEPARATE files from- // the /theme-<slug>-preview.png images used on the /themes- // overview + detail page hero — these picker assets are sized- // and art-directed for the small 120px-tall picker card.+ // theme-<slug>-picker.png banner hosted on the XDS asset CDN+ // (see PICKER_CDN). These are SEPARATE files from the+ // theme-<slug>-preview.png images used on the /themes overview ++ // detail page hero — these picker assets are sized and+ // art-directed for the small 120px-tall picker card.// background-size:cover so each image always fills the card// regardless of the source's intrinsic dimensions.surfaceButter: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-butter-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-butter-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',},surfaceGothic: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-gothic-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-gothic-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',},surfaceY2k: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-y2k-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-y2k-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',},surfaceStone: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-stone-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-stone-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',},surfaceNeutral: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-neutral-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-neutral-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',},surfaceMatcha: {backgroundColor: 'transparent',- backgroundImage: 'url(/theme-matcha-picker.png)',+ backgroundImage: `url(${PICKER_CDN}/theme-matcha-picker.png)`,backgroundSize: 'cover',backgroundPosition: 'center',backgroundRepeat: 'no-repeat',@@ -300,20 +306,13 @@ const styles = stylex.create({labelAccent: {color: 'var(--color-accent)',},- // White wordmark override for cards whose photo backdrop is too- // dark / busy for the theme accent to read against (e.g. Stone's- // dark thistle photo). Uses --color-on-dark which resolves to- // white in both modes.- labelOnDark: {- color: 'var(--color-on-dark)',- },// Theme name on top of the gradient — rendered in the theme's// heading font so the wordmark previews the brand at a glance.// Color uses --color-text-primary so it reads against the soft// gradient backdrop in both light and dark themes.//- // Fixed fontSize (24px) overrides each theme's own heading type-- // scale so the picker reads at a uniform size across all 6 cards.+ // Fixed fontSize (24px desktop / 20px narrow) overrides each theme's own+ // heading type-scale so the picker reads at a uniform size across all 6 cards.// Without this, themes with larger heading defaults (e.g. Gothic's// Manufacturing Consent display family) render noticeably bigger// than themes with smaller defaults. Wide-glyph cursive fonts@@ -334,7 +333,7 @@ const styles = stylex.create({// .xds-text.display-3 selector in each theme's @scope'd CSS (legacy class// selector; text also emits data-type="display-3")// applies the right family per card.- fontSize: 32,+ fontSize: 24,lineHeight: 1.2,color: 'var(--color-text-primary)',maxWidth: '100%',@@ -345,7 +344,7 @@ const styles = stylex.create({zIndex: 1,},mobileThemeCardLabel: {- fontSize: 24,+ fontSize: 20,},// Mobile-only floating toolbar that replaces the sidebar at// narrow viewports. position:fixed so it stays pinned to the@@ -451,9 +450,9 @@ const styles = stylex.create({// can swap the card's `surface` (background image) and the `label`// color (most use labelAccent so the wordmark reads as a brand// signature on top of the photo). Adding artwork for a new theme-// is a two-step addition: drop a public/theme-<slug>-picker.png-// file + a `surface<Name>` rule into the styles block above, then-// reference both here.+// is a two-step addition: upload a theme-<slug>-picker.png banner to+// the asset CDN (PICKER_CDN) + add a `surface<Name>` rule into the+// styles block above, then reference both here.const PICKER_OVERRIDES: Record<string,{surface: StyleXStyles; label?: StyleXStyles}@@ -467,7 +466,7 @@ const PICKER_OVERRIDES: Record<label: styles.labelAccent,},'@xds/theme-y2k': {surface: styles.surfaceY2k, label: styles.labelAccent},- '@xds/theme-stone': {surface: styles.surfaceStone, label: styles.labelOnDark},+ '@xds/theme-stone': {surface: styles.surfaceStone, label: styles.labelAccent},'@xds/theme-neutral': {surface: styles.surfaceNeutral,label: styles.labelAccent,@@ -918,7 +917,13 @@ export function ThemePackagePage({packageName, theme}: ThemePackagePageProps) {<div {...stylex.props(styles.showcaseBlock)}><XDSCard padding={0} xstyle={styles.showcaseCard}><XDSTheme theme={selectedTheme} mode={mode}>- <ThemeShowcase />+ {/* Bespoke per-theme content (e.g. Matcha's café menu); falls+ back to the template's neutral defaults when undefined. */}+ <ThemeShowcaseStore+ {...getThemeShowcaseContent(+ selectedPkgName.replace('@xds/theme-', ''),+ )}+ /></XDSTheme></XDSCard></div>diff --git a/apps/docsite/src/components/themeShowcaseContent.ts b/apps/docsite/src/components/themeShowcaseContent.tsnew file mode 100644index 0000000000..838e83be2c--- /dev/null+++ b/apps/docsite/src/components/themeShowcaseContent.ts@@ -0,0 +1,556 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * Per-theme content for the /themes showcase (the theme-showcase template+ * rendered by ThemePackagePage).+ *+ * The template ships with a generic "Studio" store (minimalist watch, wireless+ * headphones, etc.) as its defaults. Some themes read better with bespoke+ * products that match their personality — e.g. Matcha shows a matcha café menu+ * instead of gadgets. This registry supplies those overrides; the template+ * falls back to its own neutral defaults for any theme not listed here.+ *+ * Keyed by theme slug (the `<slug>` in `@xds/theme-<slug>` / /themes?theme=<slug>).+ */++import type {+ ProductSpec,+ InventoryRow,+} from '../../../../packages/cli/templates/pages/theme-showcase/page';++export interface ThemeShowcaseContent {+ images: Record<string, string>;+ products: ProductSpec[];+ inventory: InventoryRow[];+}++const XDS_CDN = 'https://lookaside.facebook.com/assets/xds_oss';++// Matcha café — matcha-drink photos.+const MATCHA_IMAGES: Record<string, string> = {+ watch: `${XDS_CDN}/matcha-product-1.png`,+ headphones: `${XDS_CDN}/matcha-product-2.png`,+ backpack: `${XDS_CDN}/matcha-product-3.png`,+ wallet: `${XDS_CDN}/matcha-product-5.png`,+ tumbler: `${XDS_CDN}/matcha-product-4.png`,+ throw_: `${XDS_CDN}/matcha-product-6.png`,+};++const MATCHA_CONTENT: ThemeShowcaseContent = {+ images: MATCHA_IMAGES,+ products: [+ {+ name: 'Iced Matcha Latte',+ description: 'Stone-ground ceremonial matcha over cold milk.',+ badge: 'Classic',+ badgeVariant: 'green',+ },+ {+ name: 'Strawberry Matcha',+ description: 'Fresh strawberry purée layered with bright matcha.',+ badge: 'Seasonal',+ badgeVariant: 'orange',+ },+ {+ name: 'Ube Matcha',+ description: 'Creamy ube and matcha for a sweet, earthy swirl.',+ badge: 'New',+ badgeVariant: 'blue',+ },+ ],+ inventory: [+ {+ id: 'a',+ name: 'Iced Matcha Latte',+ meta: 'Ceremonial grade, oat or whole',+ available: 64,+ location: 'Bar 1',+ tags: [{label: 'Classic', variant: 'green'}],+ imageKey: 'watch',+ thumbnailFallback: 'M',+ selected: false,+ },+ {+ id: 'b',+ name: 'Strawberry Matcha',+ meta: 'Real fruit purée, no syrup',+ available: 38,+ location: 'Bar 2',+ tags: [{label: 'Seasonal', variant: 'orange'}],+ imageKey: 'headphones',+ thumbnailFallback: 'S',+ selected: true,+ },+ {+ id: 'c',+ name: 'Ube Matcha',+ meta: 'Ube cream, double shot',+ available: 51,+ location: 'Bar 2',+ tags: [{label: 'New', variant: 'blue'}],+ imageKey: 'backpack',+ thumbnailFallback: 'U',+ selected: false,+ },+ {+ id: 'd',+ name: 'Vanilla Matcha',+ meta: 'Madagascar vanilla bean',+ available: 12,+ location: 'Bar 3',+ tags: [{label: 'Smooth', variant: 'yellow'}],+ imageKey: 'wallet',+ thumbnailFallback: 'V',+ selected: true,+ },+ {+ id: 'e',+ name: 'Hazelnut Matcha',+ meta: 'Toasted hazelnut, whipped top',+ available: 27,+ location: 'Bar 3',+ tags: [{label: 'Rich', variant: 'green'}],+ imageKey: 'tumbler',+ thumbnailFallback: 'H',+ selected: false,+ },+ {+ id: 'f',+ name: 'Matcha Mocha',+ meta: 'Dark chocolate, single origin',+ available: 19,+ location: 'Bar 4',+ tags: [{label: 'Bold', variant: 'orange'}],+ imageKey: 'throw_',+ thumbnailFallback: 'M',+ selected: true,+ },+ ],+};++// Butter bakery — butter/breakfast photos. Only five Butter assets exist, so+// the croissant is reused for the sixth slot.+const BUTTER_IMAGES: Record<string, string> = {+ watch: `${XDS_CDN}/Butter-Croissant.png`,+ headphones: `${XDS_CDN}/Butter-Pancake.png`,+ backpack: `${XDS_CDN}/Butter-Waffle.png`,+ wallet: `${XDS_CDN}/Butter-Toast.png`,+ tumbler: `${XDS_CDN}/Butter-Stick.png`,+ throw_: `${XDS_CDN}/Butter-Croissant.png`,+};++const BUTTER_CONTENT: ThemeShowcaseContent = {+ images: BUTTER_IMAGES,+ products: [+ {+ name: 'Butter Croissant',+ description: 'Flaky, laminated layers baked golden each morning.',+ badge: 'Fresh',+ badgeVariant: 'yellow',+ },+ {+ name: 'Buttermilk Pancakes',+ description: 'Stacked tall with a melting pat of butter.',+ badge: 'Popular',+ badgeVariant: 'orange',+ },+ {+ name: 'Belgian Waffle',+ description: 'Deep pockets made for syrup and butter.',+ badge: 'New',+ badgeVariant: 'green',+ },+ ],+ inventory: [+ {+ id: 'a',+ name: 'Butter Croissant',+ meta: 'All-butter, 27 layers',+ available: 64,+ location: 'Case 1',+ tags: [{label: 'Fresh', variant: 'yellow'}],+ imageKey: 'watch',+ thumbnailFallback: 'C',+ selected: false,+ },+ {+ id: 'b',+ name: 'Buttermilk Pancakes',+ meta: 'Stack of three',+ available: 38,+ location: 'Griddle',+ tags: [{label: 'Popular', variant: 'orange'}],+ imageKey: 'headphones',+ thumbnailFallback: 'P',+ selected: true,+ },+ {+ id: 'c',+ name: 'Belgian Waffle',+ meta: 'Liège style, pearl sugar',+ available: 51,+ location: 'Griddle',+ tags: [{label: 'New', variant: 'green'}],+ imageKey: 'backpack',+ thumbnailFallback: 'W',+ selected: false,+ },+ {+ id: 'd',+ name: 'Buttered Toast',+ meta: 'Sourdough, thick cut',+ available: 12,+ location: 'Case 2',+ tags: [{label: 'Classic', variant: 'yellow'}],+ imageKey: 'wallet',+ thumbnailFallback: 'T',+ selected: true,+ },+ {+ id: 'e',+ name: 'Cultured Butter',+ meta: 'European style, salted',+ available: 27,+ location: 'Cooler',+ tags: [{label: 'Staple', variant: 'orange'}],+ imageKey: 'tumbler',+ thumbnailFallback: 'B',+ selected: false,+ },+ {+ id: 'f',+ name: 'Almond Croissant',+ meta: 'Frangipane filled',+ available: 19,+ location: 'Case 1',+ tags: [{label: 'Limited', variant: 'green'}],+ imageKey: 'throw_',+ thumbnailFallback: 'A',+ selected: true,+ },+ ],+};++// Stone homeware — stoneware photos on stone plinths.+const STONE_IMAGES: Record<string, string> = {+ watch: `${XDS_CDN}/Stone-bowl.png`,+ headphones: `${XDS_CDN}/Stone-cup.png`,+ backpack: `${XDS_CDN}/Stone-plate.png`,+ wallet: `${XDS_CDN}/Stone-servingbowl.png`,+ tumbler: `${XDS_CDN}/Stone-teapot.png`,+ throw_: `${XDS_CDN}/Stone-vase.png`,+};++const STONE_CONTENT: ThemeShowcaseContent = {+ images: STONE_IMAGES,+ products: [+ {+ name: 'Speckled Bowl',+ description: 'Hand-thrown stoneware with a raw clay foot.',+ badge: 'New',+ badgeVariant: 'blue',+ },+ {+ name: 'Ceramic Cup',+ description: 'Everyday cup and saucer with a tactile finish.',+ badge: 'Popular',+ badgeVariant: 'green',+ },+ {+ name: 'Stoneware Plate',+ description: 'Reactive matte glaze in a soft olive tone.',+ badge: 'Limited',+ badgeVariant: 'yellow',+ },+ ],+ inventory: [+ {+ id: 'a',+ name: 'Speckled Bowl',+ meta: 'Stoneware, 16cm',+ available: 64,+ location: 'Shelf 1',+ tags: [{label: 'New', variant: 'blue'}],+ imageKey: 'watch',+ thumbnailFallback: 'B',+ selected: false,+ },+ {+ id: 'b',+ name: 'Ceramic Cup',+ meta: 'Cup + saucer, 8oz',+ available: 38,+ location: 'Shelf 2',+ tags: [{label: 'Popular', variant: 'green'}],+ imageKey: 'headphones',+ thumbnailFallback: 'C',+ selected: true,+ },+ {+ id: 'c',+ name: 'Stoneware Plate',+ meta: 'Reactive glaze, 22cm',+ available: 51,+ location: 'Shelf 1',+ tags: [{label: 'Limited', variant: 'yellow'}],+ imageKey: 'backpack',+ thumbnailFallback: 'P',+ selected: false,+ },+ {+ id: 'd',+ name: 'Serving Bowl',+ meta: 'Two-tone, 24cm',+ available: 15,+ location: 'Shelf 3',+ tags: [{label: 'Tableware', variant: 'orange'}],+ imageKey: 'wallet',+ thumbnailFallback: 'S',+ selected: true,+ },+ {+ id: 'e',+ name: 'Stoneware Teapot',+ meta: 'Matte clay, 700ml',+ available: 27,+ location: 'Shelf 2',+ tags: [{label: 'Kitchen', variant: 'green'}],+ imageKey: 'tumbler',+ thumbnailFallback: 'T',+ selected: false,+ },+ {+ id: 'f',+ name: 'Bud Vase',+ meta: 'Olive glaze, 18cm',+ available: 19,+ location: 'Shelf 1',+ tags: [{label: 'Small batch', variant: 'orange'}],+ imageKey: 'throw_',+ thumbnailFallback: 'V',+ selected: true,+ },+ ],+};++// Y2K trinkets — iridescent/holo objects.+const Y2K_IMAGES: Record<string, string> = {+ watch: `${XDS_CDN}/Y2K-Phone.png`,+ headphones: `${XDS_CDN}/Y2K-Star.png`,+ backpack: `${XDS_CDN}/Y2K-Butterfly.png`,+ wallet: `${XDS_CDN}/Y2K-Heart.png`,+ tumbler: `${XDS_CDN}/Y2K-Flower.png`,+ throw_: `${XDS_CDN}/Y2K-Couch.png`,+};++const Y2K_CONTENT: ThemeShowcaseContent = {+ images: Y2K_IMAGES,+ products: [+ {+ name: 'Holo Flip Phone',+ description: 'Iridescent clamshell with a rainbow screen.',+ badge: 'Retro',+ badgeVariant: 'blue',+ },+ {+ name: 'Glow Star Set',+ description: 'Glow-in-the-dark stars, pack of three.',+ badge: 'Popular',+ badgeVariant: 'green',+ },+ {+ name: 'Glitter Butterfly',+ description: 'Sparkly stick-on in pastel chrome.',+ badge: 'New',+ badgeVariant: 'purple',+ },+ ],+ inventory: [+ {+ id: 'a',+ name: 'Holo Flip Phone',+ meta: 'Iridescent, rainbow LCD',+ available: 64,+ location: 'Bin 1',+ tags: [{label: 'Retro', variant: 'blue'}],+ imageKey: 'watch',+ thumbnailFallback: 'P',+ selected: false,+ },+ {+ id: 'b',+ name: 'Glow Star Set',+ meta: 'Glow-in-the-dark, pack of 3',+ available: 38,+ location: 'Bin 2',+ tags: [{label: 'Popular', variant: 'green'}],+ imageKey: 'headphones',+ thumbnailFallback: 'S',+ selected: true,+ },+ {+ id: 'c',+ name: 'Glitter Butterfly',+ meta: 'Stick-on, pastel chrome',+ available: 51,+ location: 'Bin 2',+ tags: [{label: 'New', variant: 'purple'}],+ imageKey: 'backpack',+ thumbnailFallback: 'B',+ selected: false,+ },+ {+ id: 'd',+ name: 'Puffy Heart Charm',+ meta: 'Squishy, holo finish',+ available: 12,+ location: 'Bin 3',+ tags: [{label: 'Classic', variant: 'pink'}],+ imageKey: 'wallet',+ thumbnailFallback: 'H',+ selected: true,+ },+ {+ id: 'e',+ name: 'Daisy Charm',+ meta: 'Holographic, clip-on',+ available: 27,+ location: 'Bin 3',+ tags: [{label: 'Cute', variant: 'pink'}],+ imageKey: 'tumbler',+ thumbnailFallback: 'D',+ selected: false,+ },+ {+ id: 'f',+ name: 'Inflatable Couch',+ meta: 'Transparent pink, 2-seater',+ available: 19,+ location: 'Bin 1',+ tags: [{label: 'Limited', variant: 'pink'}],+ imageKey: 'throw_',+ thumbnailFallback: 'C',+ selected: true,+ },+ ],+};++// Gothic botanicals — moody single-stem floral photos.+const GOTHIC_IMAGES: Record<string, string> = {+ watch: `${XDS_CDN}/Gothic-1.png`,+ headphones: `${XDS_CDN}/Gothic-2.png`,+ backpack: `${XDS_CDN}/Gothic-3.png`,+ wallet: `${XDS_CDN}/Gothic-4.png`,+ tumbler: `${XDS_CDN}/Gothic-5.png`,+ throw_: `${XDS_CDN}/Gothic-6.png`,+};++const GOTHIC_CONTENT: ThemeShowcaseContent = {+ images: GOTHIC_IMAGES,+ products: [+ {+ name: 'Dried Sea Holly',+ description: 'A single preserved thistle stem with a steely bloom.',+ badge: 'New',+ badgeVariant: 'blue',+ },+ {+ name: 'Garden Rose',+ description: 'One peach bloom, cut fresh each morning.',+ badge: 'Popular',+ badgeVariant: 'red',+ },+ {+ name: 'Lilac Ranunculus',+ description: 'Layered petals in a soft mauve.',+ badge: 'Limited',+ badgeVariant: 'purple',+ },+ ],+ inventory: [+ {+ id: 'a',+ name: 'Dried Sea Holly',+ meta: 'Preserved, single stem',+ available: 64,+ location: 'Cooler 1',+ tags: [{label: 'New', variant: 'blue'}],+ imageKey: 'watch',+ thumbnailFallback: 'S',+ selected: false,+ },+ {+ id: 'b',+ name: 'Garden Rose',+ meta: 'Fresh cut, peach',+ available: 38,+ location: 'Cooler 2',+ tags: [{label: 'Popular', variant: 'red'}],+ imageKey: 'headphones',+ thumbnailFallback: 'R',+ selected: true,+ },+ {+ id: 'c',+ name: 'Lilac Ranunculus',+ meta: 'Fresh cut, mauve',+ available: 51,+ location: 'Cooler 2',+ tags: [{label: 'Limited', variant: 'purple'}],+ imageKey: 'backpack',+ thumbnailFallback: 'L',+ selected: false,+ },+ {+ id: 'd',+ name: 'Coral Poppy',+ meta: 'Fresh cut, single stem',+ available: 15,+ location: 'Cooler 3',+ tags: [{label: 'Seasonal', variant: 'orange'}],+ imageKey: 'wallet',+ thumbnailFallback: 'P',+ selected: true,+ },+ {+ id: 'e',+ name: 'Pink Tulip',+ meta: 'Fresh cut, single stem',+ available: 27,+ location: 'Cooler 2',+ tags: [{label: 'Spring', variant: 'pink'}],+ imageKey: 'tumbler',+ thumbnailFallback: 'T',+ selected: false,+ },+ {+ id: 'f',+ name: 'Dried Nigella Pods',+ meta: 'Preserved, branch',+ available: 19,+ location: 'Cooler 1',+ tags: [{label: 'Small batch', variant: 'green'}],+ imageKey: 'throw_',+ thumbnailFallback: 'N',+ selected: true,+ },+ ],+};++const CONTENT_BY_THEME: Record<string, ThemeShowcaseContent> = {+ matcha: MATCHA_CONTENT,+ butter: BUTTER_CONTENT,+ stone: STONE_CONTENT,+ y2k: Y2K_CONTENT,+ gothic: GOTHIC_CONTENT,+};++/**+ * Resolve bespoke showcase content for a theme slug, or `undefined` when the+ * theme has no override (the template then renders its neutral defaults).+ */+export function getThemeShowcaseContent(+ slug: string,+): ThemeShowcaseContent | undefined {+ return CONTENT_BY_THEME[slug];+}diff --git a/apps/storybook/stories/Layout.stories.tsx b/apps/storybook/stories/Layout.stories.tsxindex 052332537f..4c0857f602 100644--- a/apps/storybook/stories/Layout.stories.tsx+++ b/apps/storybook/stories/Layout.stories.tsx@@ -602,7 +602,6 @@ export const NoDividers: Story = {content={<XDSLayoutContent><p {...stylex.props(styles.bodyText)}>-When dividers are not used, the layout automatically collapsesspacing between sections for a smooth visual flow.</p>@@ -943,7 +942,6 @@ export const ContentWidthWithDividers: Story = {render: () => (<XDSVStack gap={4} xstyle={styles.storySection}><p {...stylex.props(styles.sectionLabel)}>-contentWidth=640 in a 900px container; dividers remain full-bleed whilecontent is constrained</p>@@ -994,7 +992,6 @@ export const ContentWidthWithStartPanel: Story = {render: () => (<XDSVStack gap={4} xstyle={styles.storySection}><p {...stylex.props(styles.sectionLabel)}>-contentWidth=640 with a 200px start panel: the middle row (panel +content) is constrained</p>@@ -1096,7 +1093,6 @@ export const ContentWidthNoDividers: Story = {render: () => (<XDSVStack gap={4} xstyle={styles.storySection}><p {...stylex.props(styles.sectionLabel)}>-contentWidth=640 without dividers: constraint works the same</p><div {...stylex.props(styles.cwContainer, styles.cwContainer900)}>@@ -1110,7 +1106,6 @@ export const ContentWidthNoDividers: Story = {content={<XDSLayoutContent><p {...stylex.props(styles.bodyText)}>-Even without dividers, the content is constrained to 640px andcentered. The visual flow is continuous with no divider lines.</p>@@ -1140,7 +1135,6 @@ export const ContentWidthNarrower: Story = {render: () => (<XDSVStack gap={4} xstyle={styles.storySection}><p {...stylex.props(styles.sectionLabel)}>-contentWidth=400 in a 900px container: content is visibly centered</p><div {...stylex.props(styles.cwContainer, styles.cwContainer900)}>@@ -1155,7 +1149,6 @@ export const ContentWidthNarrower: Story = {content={<XDSLayoutContent><p {...stylex.props(styles.bodyText)}>-This content is constrained to 400px inside a 900px container.Notice the visible centering, great for focused forms orsettings pages.@@ -1186,7 +1179,6 @@ export const ContentWidthWider: Story = {render: () => (<XDSVStack gap={4} xstyle={styles.storySection}><p {...stylex.props(styles.sectionLabel)}>-contentWidth=2000 in a 350px container, degrades gracefully to 100%</p><div {...stylex.props(styles.cwContainer, styles.cwContainer350)}>@@ -1201,7 +1193,6 @@ export const ContentWidthWider: Story = {content={<XDSLayoutContent><p {...stylex.props(styles.bodyText)}>-The contentWidth is 2000px but the container is only 350px. Thecontent fills 100% of the available space, with no overflow orscrollbar.diff --git a/apps/storybook/stories/Link.stories.tsx b/apps/storybook/stories/Link.stories.tsxindex 2a34919cb3..0aab06bebf 100644--- a/apps/storybook/stories/Link.stories.tsx+++ b/apps/storybook/stories/Link.stories.tsx@@ -371,7 +371,6 @@ export const LinkVsButtonComparison: Story = {</div></div><XDSText type="body" size="sm" color="secondary">-Both look the same, but inspect the DOM to see the semantic difference.</XDSText></div>diff --git a/apps/storybook/stories/SVGIcon.stories.tsx b/apps/storybook/stories/SVGIcon.stories.tsxindex 5fa008b280..a3ba609fb1 100644--- a/apps/storybook/stories/SVGIcon.stories.tsx+++ b/apps/storybook/stories/SVGIcon.stories.tsx@@ -276,7 +276,6 @@ export const MaskGaps: Story = {<XDSStack direction="vertical" gap={3}><XDSHeading level={3}>Mask Gaps on Different Backgrounds</XDSHeading><XDSText type="supporting" color="secondary">-Bold mode uses mask-based knockout gaps. Because the gap is transparent(not white), it works on any background: solid colors, surfaces, andgradients alike.@@ -393,10 +392,9 @@ export const StructuralDiversity: Story = {<XDSStack direction="vertical" gap={3}><XDSHeading level={3}>Structural Diversity</XDSHeading><XDSText type="supporting" color="secondary">-- New icons with diverse structures: organic curves, complex single- paths, nested overlapping fills, and mixed fill+stroke roles, across- all five variations.+ New icons with diverse structures: organic curves, complex single paths,+ nested overlapping fills, and mixed fill+stroke roles, across all five+ variations.</XDSText><divstyle={{diff --git a/apps/storybook/stories/TableColumnResize.stories.tsx b/apps/storybook/stories/TableColumnResize.stories.tsxindex 00d181b4f7..4a19e3bbfa 100644--- a/apps/storybook/stories/TableColumnResize.stories.tsx+++ b/apps/storybook/stories/TableColumnResize.stories.tsx@@ -96,7 +96,6 @@ export const Default: Story = {return (<div style={{maxWidth: 600}}><p style={{marginBottom: 8, fontSize: 14, color: '#666'}}>-Drag the right edge of any column header to resize. The lastproportional column has no handle; it flexes to fill remaining space.</p>diff --git a/apps/storybook/stories/TableFiltering.stories.tsx b/apps/storybook/stories/TableFiltering.stories.tsxindex fc7ede317b..b968a124f2 100644--- a/apps/storybook/stories/TableFiltering.stories.tsx+++ b/apps/storybook/stories/TableFiltering.stories.tsx@@ -536,7 +536,6 @@ export const EmptyState: Story = {return (<div style={{maxWidth: 800}}><p style={{marginBottom: 8, fontSize: 14, color: '#666'}}>-Try filtering to get zero results; empty state appears.</p><XDSTablediff --git a/apps/storybook/stories/Toast.stories.tsx b/apps/storybook/stories/Toast.stories.tsxindex 9c70b32a11..6ef1bcdc68 100644--- a/apps/storybook/stories/Toast.stories.tsx+++ b/apps/storybook/stories/Toast.stories.tsx@@ -289,7 +289,6 @@ export const NoProvider: StoryObj = {<XDSCard padding={4}><XDSStack gap={2}><p style={{margin: 0, fontSize: 14}}>-No XDSLayerProvider: the hook creates a fallback viewport ondocument.body automatically.</p>@@ -348,7 +347,6 @@ function DialogToastContent({onClose}: {onClose: () => void}) {return (<XDSStack gap={3}><p>-This dialog has its own toast viewport. Toasts fired here render insidethe dialog, above its overlay.</p>diff --git a/apps/storybook/stories/XDSMediaTheme.stories.tsx b/apps/storybook/stories/XDSMediaTheme.stories.tsxindex da02bb7f80..6b8b556a68 100644--- a/apps/storybook/stories/XDSMediaTheme.stories.tsx+++ b/apps/storybook/stories/XDSMediaTheme.stories.tsx@@ -49,7 +49,6 @@ function OnDarkDemo() {<XDSMediaTheme mode="dark"><XDSStack gap={3}><XDSText>-Content on a dark surface: text, icons, and interactive elementsautomatically adapt.</XDSText>@@ -108,7 +107,6 @@ function OnLightDemo() {<XDSMediaTheme mode="light"><XDSStack gap={3}><XDSText>-Content on a light surface in dark mode: text and icons becomedark.</XDSText>@@ -234,7 +232,6 @@ function ComponentOverrideBoundaryDemo() {<XDSTheme theme={brutalistTheme}><XDSStack gap={4}><XDSText weight="semibold">-Brutalist theme, notice the component overrides: pill buttons,uppercase text, thick card borders, bordered ghost buttons.</XDSText>@@ -390,7 +387,7 @@ function CustomOverridesDemo() {<XDSTheme theme={customTheme}><XDSStack gap={3}><XDSText>- This theme has a custom <code>onDark</code> config; the accent color+ This theme has a custom <code>onDark</code> config; the accent coloron dark surfaces is a lighter purple instead of plain white.</XDSText><divdiff --git a/apps/storybook/stories/XIFSpec.stories.tsx b/apps/storybook/stories/XIFSpec.stories.tsxindex c049aee9fd..287793defc 100644--- a/apps/storybook/stories/XIFSpec.stories.tsx+++ b/apps/storybook/stories/XIFSpec.stories.tsx@@ -269,9 +269,9 @@ export const PersonalityAxes: StoryObj = {<XDSStack direction="vertical" gap={3}><XDSHeading level={3}>Personality Axes (Conceptual)</XDSHeading><XDSText type="supporting">- Shape personality parameters adjust the <em>feel</em> of icons without- changing their structure. All adjustments are relative, preserving- the artist's hierarchy of sharp vs soft. These icons show the+ Shape personality parameters adjust the <em>feel</em> of icons without+ changing their structure. All adjustments are relative, preserving the+ artist's hierarchy of sharp vs soft. These icons show theconcept; path manipulation is not yet implemented.</XDSText>@@ -324,7 +324,6 @@ export const PersonalityAxes: StoryObj = {</div><XDSText type="supporting">-Note: opacity/stroke-width are used as visual placeholders here. Thereal implementation will modify path geometry, rounding corners,bowing segments, adjusting curve tension, all at build time via the@@ -487,7 +486,6 @@ export const PathTransformPlayground: StoryObj = {<XDSStack direction="vertical" gap={4}><XDSHeading level={3}>Path Transform Playground</XDSHeading><XDSText type="supporting">-Live path manipulation with sagitta-corrected corner rounding. Sharpcorners (like star tips) round less aggressively than gentle corners,achieving equal <em>perceived</em> roundness at all angles.@@ -496,7 +494,6 @@ export const PathTransformPlayground: StoryObj = {{/* Corner Rounding */}<XDSHeading level={4}>Corner Rounding (sagitta-corrected)</XDSHeading><XDSText type="supporting">-Same cornerRounding value across all shapes. Sharp corners get lessradius, gentle corners get more, visually balanced.</XDSText>diff --git a/packages/cli/templates/blocks/components/AppShell/AppShellMobileHookUsage.tsx b/packages/cli/templates/blocks/components/AppShell/AppShellMobileHookUsage.tsxindex 12b7256c59..fb7abc2c7a 100644--- a/packages/cli/templates/blocks/components/AppShell/AppShellMobileHookUsage.tsx+++ b/packages/cli/templates/blocks/components/AppShell/AppShellMobileHookUsage.tsx@@ -35,7 +35,8 @@ export default function AppShellMobileHookUsage() {<XDSButton label="Open navigation" variant="secondary" isDisabled /><XDSText type="body" color="secondary">AppShell mobile navigation context is available. Narrow the viewport- below the AppShell mobile breakpoint to make the custom trigger active.+ below the AppShell mobile breakpoint to make the custom trigger+ active.</XDSText></XDSVStack>);@@ -54,7 +55,6 @@ export default function AppShellMobileHookUsage() {</XDSText></XDSHStack><XDSText type="body" color="secondary">-This button controls the nearest AppShell mobile nav from context; inthe docsite it opens and closes the surrounding page navigation.</XDSText>diff --git a/packages/cli/templates/pages/theme-showcase/page.tsx b/packages/cli/templates/pages/theme-showcase/page.tsxindex 33ab29cdc8..c63ac1e129 100644--- a/packages/cli/templates/pages/theme-showcase/page.tsx+++ b/packages/cli/templates/pages/theme-showcase/page.tsx@@ -90,6 +90,12 @@ const styles = stylex.create({width: '100%',overflowX: 'auto' as const,},+ // Inset the table by --spacing-6 (the card is padding={0}) so its edge lines+ // up with the header/filter row in every theme's spacing scale.+ inventoryTableWrap: {+ paddingInline: 'var(--spacing-6)',+ paddingBlockEnd: 'var(--spacing-2)',+ },searchInput: {flex: 1,minWidth: 0,@@ -138,6 +144,12 @@ const styles = stylex.create({textAlign: 'center' as const,maxWidth: 560,},+ // Hero headline painted with the theme's accent-text ink. XDSText has no+ // 'accent' color value, so we set the dedicated --color-text-accent token+ // directly (distinct from --color-accent / the 'active' color).+ heroHeadline: {+ color: 'var(--color-text-accent)',+ },centerText: {textAlign: 'center',},@@ -148,7 +160,10 @@ const styles = stylex.create({flex: 1,},quantityInput: {- width: 40,+ // minWidth (not a hard width) so the field grows to fit the digit + the+ // theme's input padding. A fixed 40px was too tight on themes with larger+ // padding / bigger type scale (e.g. Matcha, Y2K), clipping the value.+ minWidth: 64,flexShrink: 0,},cartButton: {@@ -168,16 +183,16 @@ const inlineStyles: Record<string, CSSProperties> = {paddingBottom: 'var(--spacing-4)',},thumbnail: {- width: 32,- height: 32,+ width: 40,+ height: 40,borderRadius: 'var(--radius-element)',objectFit: 'cover',display: 'block',flexShrink: 0,},thumbnailFallback: {- width: 32,- height: 32,+ width: 40,+ height: 40,borderRadius: 'var(--radius-element)',backgroundColor: 'var(--color-background-muted)',color: 'var(--color-text-secondary)',@@ -188,21 +203,6 @@ const inlineStyles: Record<string, CSSProperties> = {fontWeight: 600,flexShrink: 0,},- sparkline: {- display: 'flex',- alignItems: 'flex-end',- justifyContent: 'space-around',- height: 120,- width: '100%',- gap: 8,- },- sparkLabels: {- display: 'flex',- justifyContent: 'space-around',- width: '100%',- color: 'var(--color-text-secondary)',- fontSize: 'var(--font-size-xs)',- },kpiValue: {fontSize: 24,fontWeight: 700,@@ -248,50 +248,82 @@ const inlineStyles: Record<string, CSSProperties> = {},};-// Sparkline bar — height is data-driven, so it's a function returning an-// inline style object (same reasoning as inlineStyles above).-const sparkBarStyle = (height: string): CSSProperties => ({- flex: 1,- minWidth: 0,- borderRadius: 'var(--radius-element)',- backgroundColor: 'var(--color-background-green)',- height,-});-const PRODUCT_IMAGE_KEYS = ['watch', 'headphones', 'backpack'];-const PRODUCTS = [+/** Categorical badge variants usable for showcase product/inventory tags. */+export type ShowcaseBadgeVariant =+ | 'blue'+ | 'cyan'+ | 'green'+ | 'orange'+ | 'pink'+ | 'purple'+ | 'red'+ | 'teal'+ | 'yellow';++export interface ProductSpec {+ name: string;+ description: string;+ badge: string;+ badgeVariant: ShowcaseBadgeVariant;+}++const DEFAULT_PRODUCTS: ProductSpec[] = [{name: 'Minimalist Watch',description: 'Clean design meets everyday durability.',badge: 'New',- badgeVariant: 'blue' as const,+ badgeVariant: 'blue',},{name: 'Wireless Headphones',description: 'Immersive sound, all-day comfort.',badge: 'Popular',- badgeVariant: 'green' as const,+ badgeVariant: 'green',},{name: 'Canvas Backpack',description: 'Water-resistant canvas with a quiet, modern profile.',badge: 'Limited',- badgeVariant: 'yellow' as const,+ badgeVariant: 'yellow',},];-const PREVIEW_IMAGES: Record<string, string> = {- watch: '/neutral/preview-watch.png',- headphones: '/neutral/preview-headphones.png',- backpack: '/neutral/preview-backpack.png',- wallet: '/neutral/preview-wallet.png',- mug: '/neutral/preview-mug.png',- throw_: '/neutral/preview-throw.png',+// Neutral product photos, served from the shared xds_oss asset CDN so the+// scaffolded template renders real imagery without needing local public assets.+const NEUTRAL_CDN = 'https://lookaside.facebook.com/assets/xds_oss';+const DEFAULT_IMAGES: Record<string, string> = {+ watch: `${NEUTRAL_CDN}/Neutral-Watch.png`,+ headphones: `${NEUTRAL_CDN}/Neutral-Headphones.png`,+ backpack: `${NEUTRAL_CDN}/Neutral-Backpack.png`,+ wallet: `${NEUTRAL_CDN}/Neutral-Wallet.png`,+ tumbler: `${NEUTRAL_CDN}/Neutral-Tumbler.png`,+ throw_: `${NEUTRAL_CDN}/Neutral-Blanket.png`,};+export interface ThemeShowcaseProps {+ /** Product card images keyed by slot (watch/headphones/backpack/…). */+ images?: Record<string, string>;+ /** The three hero product cards. Defaults to the neutral store products. */+ products?: ProductSpec[];+ /** Inventory table rows. Defaults to the neutral store inventory. */+ inventory?: InventoryRow[];+}++// Default export is the route page (sandbox renders this as a Next.js page, so+// it must take no props / satisfy PageProps). It renders the store with the+// neutral defaults. Consumers that need per-theme content import the named+// `ThemeShowcaseStore` below and pass images/products/inventory.export default function ThemeShowcase() {- const images: Record<string, string> = PREVIEW_IMAGES;+ return <ThemeShowcaseStore />;+}++export function ThemeShowcaseStore({+ images = DEFAULT_IMAGES,+ products = DEFAULT_PRODUCTS,+ inventory = DEFAULT_INVENTORY,+}: ThemeShowcaseProps = {}) {const {isMobile} = useXDSAppShellMobile();return (<div@@ -299,13 +331,17 @@ export default function ThemeShowcase() {minHeight: '100%',backgroundColor: 'var(--color-background-body)',}}>- <StorePreview images={images} isMobile={isMobile} />+ <StorePreview images={images} products={products} isMobile={isMobile} /><divstyle={{padding: 'var(--spacing-6)',backgroundColor: 'var(--color-background-surface)',}}>- <CardShowcase images={images} isMobile={isMobile} />+ <CardShowcase+ images={images}+ inventory={inventory}+ isMobile={isMobile}+ /></div></div>);@@ -313,9 +349,11 @@ export default function ThemeShowcase() {function CardShowcase({images,+ inventory,isMobile,}: {images: Record<string, string>;+ inventory: InventoryRow[];isMobile: boolean;}) {const columns = isMobile ? 1 : ({minWidth: 200, repeat: 'fit'} as const);@@ -332,7 +370,7 @@ function CardShowcase({</XDSGrid><XDSGrid columns={columns} gap={4}><XDSGridSpan columns={isMobile ? 1 : 3}>- <InventoryCard images={images} />+ <InventoryCard images={images} inventory={inventory} /></XDSGridSpan><XDSGridSpan columns={1}><LatestActivityCard isMobile={isMobile} />@@ -344,9 +382,11 @@ function CardShowcase({function StorePreview({images,+ products,isMobile,}: {images: Record<string, string>;+ products: ProductSpec[];isMobile: boolean;}) {return (@@ -402,7 +442,7 @@ function StorePreview({<XDSVStack gap={10} xstyle={[styles.content, styles.contentFluid]}><XDSCenter><XDSVStack gap={4} hAlign="center" xstyle={styles.heroText}>- <XDSText type="display-3">+ <XDSText type="display-2" xstyle={styles.heroHeadline}>Little joys,<br />everywhere you go@@ -415,7 +455,7 @@ function StorePreview({</XDSCenter><XDSGrid columns={isMobile ? 1 : {minWidth: 200, max: 3}} gap={4}>- {PRODUCTS.map((p, i) => (+ {products.map((p, i) => (<XDSCard key={p.name} padding={0} height="100%"><XDSVStack gap={0} xstyle={styles.cardStack}><XDSAspectRatio ratio={1}>@@ -456,6 +496,7 @@ function StorePreview({<XDSButtonlabel="Add to cart"variant="secondary"+ size="sm"href="#"xstyle={styles.cartButton}/>@@ -794,9 +835,6 @@ function ChatCard() {);}-const SPARKLINE_DATA = [55, 70, 92, 78, 60];-const SPARKLINE_LABELS = ['Jan', 'Feb', 'Mar', 'Apr', 'May'];-interface ActivityRow {id: string;icon: ReactNode;@@ -860,19 +898,6 @@ function LatestActivityCard({isMobile}: {isMobile: boolean}) {<XDSVStack gap={4} xstyle={styles.activityCardStack}><XDSHeading level={2}>Revenue</XDSHeading>- <XDSVStack gap={2}>- <div style={inlineStyles.sparkline} aria-hidden="true">- {SPARKLINE_DATA.map((value, i) => (- <div key={i} style={sparkBarStyle(value + '%')} />- ))}- </div>- <div style={inlineStyles.sparkLabels} aria-hidden="true">- {SPARKLINE_LABELS.map(label => (- <span key={label}>{label}</span>- ))}- </div>- </XDSVStack>-<XDSGrid columns={isMobile ? 1 : 2} gap={3}><XDSVStack gap={0}><span style={inlineStyles.kpiValue}>18K</span>@@ -923,9 +948,9 @@ function LatestActivityCard({isMobile}: {isMobile: boolean}) {);}-type TagSpec = {label: string; variant: 'blue' | 'green' | 'orange' | 'yellow'};+type TagSpec = {label: string; variant: ShowcaseBadgeVariant};-interface InventoryRow extends Record<string, unknown> {+export interface InventoryRow extends Record<string, unknown> {id: string;name: string;meta: string;@@ -937,7 +962,7 @@ interface InventoryRow extends Record<string, unknown> {selected: boolean;}-const INVENTORY: InventoryRow[] = [+const DEFAULT_INVENTORY: InventoryRow[] = [{id: 'a',name: 'Minimalist Watch',@@ -984,12 +1009,12 @@ const INVENTORY: InventoryRow[] = [},{id: 'e',- name: 'Travel Mug',+ name: 'Travel Tumbler',meta: 'Vacuum insulated, 16oz',available: 87,location: 'Aisle 5',tags: [{label: 'Drinkware', variant: 'green'}],- imageKey: 'mug',+ imageKey: 'tumbler',thumbnailFallback: 'T',selected: false,},@@ -1007,9 +1032,6 @@ const INVENTORY: InventoryRow[] = [];const LOW_STOCK_THRESHOLD = 25;-const LOW_STOCK_COUNT = INVENTORY.filter(- row => row.available < LOW_STOCK_THRESHOLD,-).length;function SelectCell({row}: {row: InventoryRow}) {return (@@ -1065,6 +1087,7 @@ function ActionsCell() {return (<XDSMoreMenulabel="Row actions"+ size="sm"items={[{label: 'Edit'},{label: 'Duplicate'},@@ -1076,7 +1099,16 @@ function ActionsCell() {);}-function InventoryCard({images}: {images: Record<string, string>}) {+function InventoryCard({+ images,+ inventory,+}: {+ images: Record<string, string>;+ inventory: InventoryRow[];+}) {+ const lowStockCount = inventory.filter(+ row => row.available < LOW_STOCK_THRESHOLD,+ ).length;return (<XDSCard padding={0} xstyle={styles.inventoryCard}><XDSHStack@@ -1185,60 +1217,72 @@ function InventoryCard({images}: {images: Record<string, string>}) {</XDSHStack></XDSHStack>- {LOW_STOCK_COUNT > 0 && (+ {lowStockCount > 0 && (<div style={inlineStyles.inventoryBannerWrap}><XDSBannerstatus="warning"- title={LOW_STOCK_COUNT + ' items are running low'}+ title={lowStockCount + ' items are running low'}/></div>)}- <XDSTable<InventoryRow>- data={INVENTORY}- columns={[- {- key: 'select',- header: '',- width: pixel(48),- renderCell: row => <SelectCell row={row} />,- },- {- key: 'item',- header: 'Item',- width: proportional(3),- renderCell: row => <ItemCell row={row} images={images} />,- },- {- key: 'available',- header: 'Available',- width: pixel(100),- renderCell: row => <XDSText type="body">{row.available}</XDSText>,- },- {- key: 'location',- header: 'Location',- width: pixel(100),- renderCell: row => <XDSText type="body">{row.location}</XDSText>,- },- {- key: 'tags',- header: 'Tags',- width: proportional(2),- align: 'end',- renderCell: row => <TagsCell row={row} />,- },- {- key: 'actions',- header: '',- width: pixel(48),- renderCell: () => <ActionsCell />,- },- ]}- density="spacious"- dividers="rows"- hasHover- />+ <div {...stylex.props(styles.inventoryTableWrap)}>+ <XDSTable<InventoryRow>+ data={inventory}+ columns={[+ {+ key: 'select',+ header: '',+ // Wide enough that the control + the theme's cell padding (up to+ // --spacing-4 = 16px/side on spacious density) fit inside the cell,+ // so the control's hover background doesn't overflow toward the+ // card's clipped (rounded) edge on larger-padding themes.+ width: pixel(64),+ renderCell: row => <SelectCell row={row} />,+ },+ {+ key: 'item',+ header: 'Item',+ // Lower min-width (default 120) so the table fits its container on+ // larger-spacing themes instead of overflowing the actions column.+ width: proportional(3, {minWidth: 80}),+ renderCell: row => <ItemCell row={row} images={images} />,+ },+ {+ key: 'available',+ header: 'Available',+ width: pixel(100),+ renderCell: row => <XDSText type="body">{row.available}</XDSText>,+ },+ {+ key: 'location',+ header: 'Location',+ width: pixel(100),+ renderCell: row => <XDSText type="body">{row.location}</XDSText>,+ },+ {+ key: 'tags',+ header: 'Tags',+ width: proportional(2, {minWidth: 80}),+ align: 'end',+ renderCell: row => <TagsCell row={row} />,+ },+ {+ key: 'actions',+ header: '',+ // Match the select column: fit the sm more-menu button + cell+ // padding so its hover background stays clear of the card's+ // clipped rounded edge across themes.+ width: pixel(64),+ align: 'end',+ renderCell: () => <ActionsCell />,+ },+ ]}+ density="spacious"+ dividers="rows"+ hasHover+ />+ </div></XDSCard>);}diff --git a/packages/themes/butter/src/butterTheme.ts b/packages/themes/butter/src/butterTheme.tsindex e4d49ef76a..67101cdacf 100644--- a/packages/themes/butter/src/butterTheme.ts+++ b/packages/themes/butter/src/butterTheme.ts@@ -115,9 +115,9 @@ export const butterTheme = defineTheme({'--color-success': ['#004700', '#99d94b'],'--color-success-muted': ['#00470033', '#99d94b40'],- // Border+ // Border — softer taupe card outline (emphasized) in light mode.'--color-border': ['#e5e3d4', '#f3f2e21A'],- '--color-border-emphasized': ['#79786a', '#939184'],+ '--color-border-emphasized': ['#C7C4B2', '#939184'],// Effects'--color-skeleton': ['#e5e3d4', '#49473b'],@@ -224,10 +224,40 @@ export const butterTheme = defineTheme({},components: {+ // TopNav uses Butter's blue accent: the heading and the selected item are+ // the full brand blue; unselected items (default + hover) use a lighter+ // blue. Dark mode keeps the theme's butter-yellow accent.+ 'top-nav-heading': {+ // The heading text is an inner span that reads --color-text-primary, so+ // redirect that token (not just `color`) to the brand blue so the text+ // itself turns blue, not only the container.+ base: {+ color: 'light-dark(#225BFF, #FDEE8C)',+ '--color-text-primary': 'light-dark(#225BFF, #FDEE8C)',+ },+ },+ 'top-nav-item': {+ base: {+ color: 'light-dark(#6E92FF, #FDEE8CCC)',+ },+ // Selected item: full brand blue, no pill background — rely on weight ++ // color for emphasis. Hover/active keep the neutral overlay.+ selected: {+ color: 'light-dark(#225BFF, #FDEE8C)',+ backgroundColor: 'transparent',+ ':hover': {+ backgroundColor: 'var(--color-overlay-hover)',+ },+ ':active': {+ backgroundColor: 'var(--color-overlay-pressed)',+ },+ },+ },button: {- // 8px radius, generous padding around the label.+ // Radius intentionally not pinned, so buttons keep core's+ // `var(--_button-radius, --radius-element)`: standalone buttons stay 8px,+ // while the chat composer (which sets --_button-radius) rounds them fully.base: {- borderRadius: 'var(--radius-element)',paddingBlock: 'var(--spacing-3)',paddingInline: 'var(--spacing-4)',},diff --git a/packages/themes/gothic/src/gothicTheme.ts b/packages/themes/gothic/src/gothicTheme.tsindex 80dee639f2..c992407fed 100644--- a/packages/themes/gothic/src/gothicTheme.ts+++ b/packages/themes/gothic/src/gothicTheme.ts@@ -26,18 +26,18 @@ import {gothicIconRegistry} from './icons';const gothicSyntax = defineSyntaxTheme({name: 'xds-gothic',tokens: {- keyword: '#c39adb', // Cathedral plum- string: '#a3c987', // Forest moss- comment: '#6b7079', // Faded ink- number: '#dec074', // Aged gold- function: '#8aa1d8', // Midnight indigo- type: '#c39adb', // Cathedral plum- variable: '#E8F1F6', // Parchment- operator: '#96A0AB', // Mid neutral- constant: '#e6b85e', // Candlelight amber- tag: '#d97580', // Blood crimson- attribute: '#dec074', // Aged gold- property: '#7cc5b3', // Verdigris+ keyword: '#c39adb', // Cathedral plum+ string: '#a3c987', // Forest moss+ comment: '#6b7079', // Faded ink+ number: '#dec074', // Aged gold+ function: '#8aa1d8', // Midnight indigo+ type: '#c39adb', // Cathedral plum+ variable: '#E8F1F6', // Parchment+ operator: '#96A0AB', // Mid neutral+ constant: '#e6b85e', // Candlelight amber+ tag: '#d97580', // Blood crimson+ attribute: '#dec074', // Aged gold+ property: '#7cc5b3', // Verdigrispunctuation: '#7a8290', // Mid neutralbackground: '#101314',},@@ -47,7 +47,9 @@ export const gothicTheme = defineTheme({name: 'gothic',typography: {- scale: {base: 14, ratio: 1.2},+ // base 16 / ratio 1.25 — larger scale so the (optically small) blackletter+ // display sizes read large enough to carry the theme.+ scale: {base: 16, ratio: 1.25},body: {family: 'Fustat',fallbacks:@@ -114,11 +116,11 @@ export const gothicTheme = defineTheme({// Status / Sentiment — dusty pastels matching the categorical// pattern. Used for status surfaces, destructive button bg, etc.- '--color-success': '#b3c79a', // sage moss+ '--color-success': '#b3c79a', // sage moss'--color-success-muted': '#b3c79a',- '--color-error': '#c6a6a2', // dusty rose+ '--color-error': '#c6a6a2', // dusty rose'--color-error-muted': '#c6a6a2',- '--color-warning': '#d3c490', // aged gold+ '--color-warning': '#d3c490', // aged gold'--color-warning-muted': '#d3c490',// Border@@ -210,12 +212,9 @@ export const gothicTheme = defineTheme({// =========================================================================// Shadows — restrained, atmospheric// =========================================================================- '--shadow-low':- '0 2px 4px #00000033, 0 4px 8px #00000040',- '--shadow-med':- '0 2px 4px #00000033, 0 4px 12px #00000040',- '--shadow-high':- '0 4px 6px #00000040, 0 12px 24px #0000004D',+ '--shadow-low': '0 2px 4px #00000033, 0 4px 8px #00000040',+ '--shadow-med': '0 2px 4px #00000033, 0 4px 12px #00000040',+ '--shadow-high': '0 4px 6px #00000040, 0 12px 24px #0000004D','--shadow-inset-hover': 'inset 0px 0px 0px 1px #96A0AB30','--shadow-inset-selected': 'inset 0px 0px 0px 2px #96A0AB50','--shadow-inset-success': 'inset 0px 0px 0px 1px #87b06a50',@@ -396,93 +395,263 @@ export const gothicTheme = defineTheme({export const gothicPalettes = {// Neutral — H=210 C=4 (cool blue-gray, original gothic)neutral: {- hue: 210, chroma: 4,- 0: '#000000', 5: '#0a0d0f', 10: '#101314', 15: '#181c1f', 20: '#24292D',- 25: '#2c3236', 30: '#363c40', 35: '#40464b', 40: '#495056', 45: '#535a61',- 50: '#5d646b', 55: '#676f76', 60: '#727a82', 65: '#7e8690', 70: '#8a929c',- 75: '#96A0AB', 80: '#a8b1bb', 85: '#bbc3cb', 90: '#cdd5db', 95: '#E8F1F6',+ hue: 210,+ chroma: 4,+ 0: '#000000',+ 5: '#0a0d0f',+ 10: '#101314',+ 15: '#181c1f',+ 20: '#24292D',+ 25: '#2c3236',+ 30: '#363c40',+ 35: '#40464b',+ 40: '#495056',+ 45: '#535a61',+ 50: '#5d646b',+ 55: '#676f76',+ 60: '#727a82',+ 65: '#7e8690',+ 70: '#8a929c',+ 75: '#96A0AB',+ 80: '#a8b1bb',+ 85: '#bbc3cb',+ 90: '#cdd5db',+ 95: '#E8F1F6',100: '#ffffff',},// Blue — H=255 C=20 (midnight indigo)blue: {- hue: 255, chroma: 20,- 0: '#000000', 5: '#050930', 10: '#0c143f', 15: '#161e4d', 20: '#1f2c54',- 25: '#2a3565', 30: '#2a3b6e', 35: '#3a4783', 40: '#475497', 45: '#5462ab',- 50: '#6170bf', 55: '#6a85cf', 60: '#7793d6', 65: '#8aa1d8', 70: '#a3b5e0',- 75: '#b6c5e7', 80: '#c4d1ec', 85: '#d2dcef', 90: '#dde2f1', 95: '#e8ecf6',+ hue: 255,+ chroma: 20,+ 0: '#000000',+ 5: '#050930',+ 10: '#0c143f',+ 15: '#161e4d',+ 20: '#1f2c54',+ 25: '#2a3565',+ 30: '#2a3b6e',+ 35: '#3a4783',+ 40: '#475497',+ 45: '#5462ab',+ 50: '#6170bf',+ 55: '#6a85cf',+ 60: '#7793d6',+ 65: '#8aa1d8',+ 70: '#a3b5e0',+ 75: '#b6c5e7',+ 80: '#c4d1ec',+ 85: '#d2dcef',+ 90: '#dde2f1',+ 95: '#e8ecf6',100: '#ffffff',},// Cyan — H=200 C=25 (cathedral mist)cyan: {- hue: 200, chroma: 25,- 0: '#000000', 5: '#001724', 10: '#062436', 15: '#0d3046', 20: '#204858',- 25: '#1c4a66', 30: '#2a5e75', 35: '#3a6e85', 40: '#487d94', 45: '#598ea3',- 50: '#6a9eb1', 55: '#7ab0c0', 60: '#8cc3d8', 65: '#a0cce0', 70: '#b1d3e5',- 75: '#bcdaeb', 80: '#c5dfee', 85: '#cbe4f0', 90: '#d6e6ee', 95: '#e3eef3',+ hue: 200,+ chroma: 25,+ 0: '#000000',+ 5: '#001724',+ 10: '#062436',+ 15: '#0d3046',+ 20: '#204858',+ 25: '#1c4a66',+ 30: '#2a5e75',+ 35: '#3a6e85',+ 40: '#487d94',+ 45: '#598ea3',+ 50: '#6a9eb1',+ 55: '#7ab0c0',+ 60: '#8cc3d8',+ 65: '#a0cce0',+ 70: '#b1d3e5',+ 75: '#bcdaeb',+ 80: '#c5dfee',+ 85: '#cbe4f0',+ 90: '#d6e6ee',+ 95: '#e3eef3',100: '#ffffff',},// Green — H=140 C=18 (forest moss)green: {- hue: 140, chroma: 18,- 0: '#000000', 5: '#0c1a08', 10: '#152511', 15: '#1c321a', 20: '#2c4a20',- 25: '#2c4d2a', 30: '#3a5e2c', 35: '#446a39', 40: '#557c44', 45: '#658d50',- 50: '#779e5d', 55: '#87b06a', 60: '#96bd76', 65: '#a3c987', 70: '#b5d397',- 75: '#bdd99e', 80: '#c8e0ad', 85: '#d4e6bd', 90: '#dde6d4', 95: '#eaf3df',+ hue: 140,+ chroma: 18,+ 0: '#000000',+ 5: '#0c1a08',+ 10: '#152511',+ 15: '#1c321a',+ 20: '#2c4a20',+ 25: '#2c4d2a',+ 30: '#3a5e2c',+ 35: '#446a39',+ 40: '#557c44',+ 45: '#658d50',+ 50: '#779e5d',+ 55: '#87b06a',+ 60: '#96bd76',+ 65: '#a3c987',+ 70: '#b5d397',+ 75: '#bdd99e',+ 80: '#c8e0ad',+ 85: '#d4e6bd',+ 90: '#dde6d4',+ 95: '#eaf3df',100: '#ffffff',},// Orange — H=40 C=35 (rust copper)orange: {- hue: 40, chroma: 35,- 0: '#000000', 5: '#1f0d00', 10: '#2c1606', 15: '#3a200d', 20: '#6e3812',- 25: '#5a371a', 30: '#8a4818', 35: '#9a5824', 40: '#a05728', 45: '#b66839',- 50: '#c87a4a', 55: '#d6905a', 60: '#dca275', 65: '#e1b288', 70: '#e8b894',- 75: '#ebbf9d', 80: '#eecfb5', 85: '#efddcd', 90: '#f3e5d8', 95: '#f9eee5',+ hue: 40,+ chroma: 35,+ 0: '#000000',+ 5: '#1f0d00',+ 10: '#2c1606',+ 15: '#3a200d',+ 20: '#6e3812',+ 25: '#5a371a',+ 30: '#8a4818',+ 35: '#9a5824',+ 40: '#a05728',+ 45: '#b66839',+ 50: '#c87a4a',+ 55: '#d6905a',+ 60: '#dca275',+ 65: '#e1b288',+ 70: '#e8b894',+ 75: '#ebbf9d',+ 80: '#eecfb5',+ 85: '#efddcd',+ 90: '#f3e5d8',+ 95: '#f9eee5',100: '#ffffff',},// Pink — H=345 C=22 (rose madder)pink: {- hue: 345, chroma: 22,- 0: '#000000', 5: '#22060e', 10: '#2e0c16', 15: '#3a131e', 20: '#71223c',- 25: '#572235', 30: '#8d2d4c', 35: '#9b3358', 40: '#a04563', 45: '#a04a6e',- 50: '#b15876', 55: '#c26988', 60: '#cf7593', 65: '#d56891', 70: '#dc82a4',- 75: '#e094b1', 80: '#e7a5be', 85: '#ebb6ca', 90: '#eed6df', 95: '#f5e3eb',+ hue: 345,+ chroma: 22,+ 0: '#000000',+ 5: '#22060e',+ 10: '#2e0c16',+ 15: '#3a131e',+ 20: '#71223c',+ 25: '#572235',+ 30: '#8d2d4c',+ 35: '#9b3358',+ 40: '#a04563',+ 45: '#a04a6e',+ 50: '#b15876',+ 55: '#c26988',+ 60: '#cf7593',+ 65: '#d56891',+ 70: '#dc82a4',+ 75: '#e094b1',+ 80: '#e7a5be',+ 85: '#ebb6ca',+ 90: '#eed6df',+ 95: '#f5e3eb',100: '#ffffff',},// Purple — H=290 C=30 (cathedral plum)purple: {- hue: 290, chroma: 30,- 0: '#000000', 5: '#1e0c25', 10: '#2a1334', 15: '#371b43', 20: '#481b58',- 25: '#502163', 30: '#5a2370', 35: '#6e3088', 40: '#82409c', 45: '#9352ad',- 50: '#a363bd', 55: '#b06ec9', 60: '#bb7cd1', 65: '#c084d6', 70: '#c692db',- 75: '#cd9be0', 80: '#d2a3df', 85: '#dab3e6', 90: '#e6daee', 95: '#f0e6f4',+ hue: 290,+ chroma: 30,+ 0: '#000000',+ 5: '#1e0c25',+ 10: '#2a1334',+ 15: '#371b43',+ 20: '#481b58',+ 25: '#502163',+ 30: '#5a2370',+ 35: '#6e3088',+ 40: '#82409c',+ 45: '#9352ad',+ 50: '#a363bd',+ 55: '#b06ec9',+ 60: '#bb7cd1',+ 65: '#c084d6',+ 70: '#c692db',+ 75: '#cd9be0',+ 80: '#d2a3df',+ 85: '#dab3e6',+ 90: '#e6daee',+ 95: '#f0e6f4',100: '#ffffff',},// Red — H=15 C=12 (dusty rose) — gothic uses a desaturated rose// family rather than vibrant crimson; #c6a6a2 sits near T80.red: {- hue: 15, chroma: 12,- 0: '#000000', 5: '#1c0d09', 10: '#26140f', 15: '#301b16', 20: '#3a231d',- 25: '#452c25', 30: '#50352d', 35: '#5b3e36', 40: '#66483e', 45: '#725347',- 50: '#7d5e51', 55: '#896a5b', 60: '#957565', 65: '#a18170', 70: '#ad8d7b',- 75: '#b99a87', 80: '#c6a6a2', 85: '#d2b4af', 90: '#dec2bc', 95: '#ebd0ca',+ hue: 15,+ chroma: 12,+ 0: '#000000',+ 5: '#1c0d09',+ 10: '#26140f',+ 15: '#301b16',+ 20: '#3a231d',+ 25: '#452c25',+ 30: '#50352d',+ 35: '#5b3e36',+ 40: '#66483e',+ 45: '#725347',+ 50: '#7d5e51',+ 55: '#896a5b',+ 60: '#957565',+ 65: '#a18170',+ 70: '#ad8d7b',+ 75: '#b99a87',+ 80: '#c6a6a2',+ 85: '#d2b4af',+ 90: '#dec2bc',+ 95: '#ebd0ca',100: '#ffffff',},// Teal — H=170 C=20 (verdigris)teal: {- hue: 170, chroma: 20,- 0: '#000000', 5: '#001b14', 10: '#062821', 15: '#0d3530', 20: '#174a40',- 25: '#194e44', 30: '#1f5e52', 35: '#2c6c5f', 40: '#3a7b6c', 45: '#498a7a',- 50: '#5aa091', 55: '#5db5a3', 60: '#6cbeab', 65: '#7cc5b3', 70: '#90d0c0',- 75: '#9fd4c5', 80: '#b1ddcf', 85: '#c0e1d6', 90: '#d4e7e2', 95: '#e1efe9',+ hue: 170,+ chroma: 20,+ 0: '#000000',+ 5: '#001b14',+ 10: '#062821',+ 15: '#0d3530',+ 20: '#174a40',+ 25: '#194e44',+ 30: '#1f5e52',+ 35: '#2c6c5f',+ 40: '#3a7b6c',+ 45: '#498a7a',+ 50: '#5aa091',+ 55: '#5db5a3',+ 60: '#6cbeab',+ 65: '#7cc5b3',+ 70: '#90d0c0',+ 75: '#9fd4c5',+ 80: '#b1ddcf',+ 85: '#c0e1d6',+ 90: '#d4e7e2',+ 95: '#e1efe9',100: '#ffffff',},// Yellow — H=80 C=40 (aged gold)yellow: {- hue: 80, chroma: 40,- 0: '#000000', 5: '#2c1d00', 10: '#3a2900', 15: '#4a3500', 20: '#6c5010',- 25: '#6c5010', 30: '#876515', 35: '#9c7b1f', 40: '#b18e2f', 45: '#c39e3e',- 50: '#cca74c', 55: '#d6b56a', 60: '#dec074', 65: '#e2c884', 70: '#e6d091',- 75: '#e9d29a', 80: '#ebd9a7', 85: '#ebe1c4', 90: '#f0e8d6', 95: '#f7f1e3',+ hue: 80,+ chroma: 40,+ 0: '#000000',+ 5: '#2c1d00',+ 10: '#3a2900',+ 15: '#4a3500',+ 20: '#6c5010',+ 25: '#6c5010',+ 30: '#876515',+ 35: '#9c7b1f',+ 40: '#b18e2f',+ 45: '#c39e3e',+ 50: '#cca74c',+ 55: '#d6b56a',+ 60: '#dec074',+ 65: '#e2c884',+ 70: '#e6d091',+ 75: '#e9d29a',+ 80: '#ebd9a7',+ 85: '#ebe1c4',+ 90: '#f0e8d6',+ 95: '#f7f1e3',100: '#ffffff',},} as const;diff --git a/packages/themes/matcha/src/matchaTheme.ts b/packages/themes/matcha/src/matchaTheme.tsindex 5fe77f3bef..96e74f2133 100644--- a/packages/themes/matcha/src/matchaTheme.ts+++ b/packages/themes/matcha/src/matchaTheme.ts@@ -36,7 +36,8 @@ export const matchaTheme = defineTheme({name: 'matcha',typography: {- scale: {base: 18, ratio: 1.414},+ // base 16 / ratio 1.25 — aligned with the other themes' geometric scale.+ scale: {base: 16, ratio: 1.25},body: {family: 'DM Sans',fallbacks:@@ -44,8 +45,7 @@ export const matchaTheme = defineTheme({},heading: {family: 'Playwrite US Trad',- fallbacks:- 'Georgia, "Times New Roman", Times, serif',+ fallbacks: 'Georgia, "Times New Roman", Times, serif',},code: {family: 'JetBrains Mono',@@ -106,8 +106,9 @@ export const matchaTheme = defineTheme({'--color-warning-muted': ['#FFB60020', '#ffc94020'],// Border- '--color-border': ['#C0CBA9', '#C0CBA91A'],- '--color-border-emphasized': ['#707E46', '#5a6440'],+ // Softer sage borders (default + emphasized/card) in light mode.+ '--color-border': ['#DCE3CE', '#C0CBA91A'],+ '--color-border-emphasized': ['#B7C29E', '#5a6440'],// Effects'--color-skeleton': ['#C0CBA9', '#5a6440'],@@ -200,21 +201,8 @@ export const matchaTheme = defineTheme({'--radius-container': '18px','--radius-page': '42px',- // =========================================================================- // Font sizes (base 18, ratio 1.414)- // =========================================================================- '--font-size-4xs': '0.1875rem',- '--font-size-3xs': '0.3125rem',- '--font-size-2xs': '0.375rem',- '--font-size-xs': '0.5625rem',- '--font-size-sm': '0.8125rem',- '--font-size-base': '1.125rem',- '--font-size-lg': '1.5625rem',- '--font-size-xl': '2.25rem',- '--font-size-2xl': '3.1875rem',- '--font-size-3xl': '4.5rem',- '--font-size-4xl': '6.375rem',- '--font-size-5xl': '9rem',+ // No explicit --font-size-* overrides — font sizes come from+ // typography.scale above, keeping the scale the single source of truth.// =========================================================================// Element sizes@@ -226,12 +214,9 @@ export const matchaTheme = defineTheme({// =========================================================================// Shadows// =========================================================================- '--shadow-low':- '0 2px 4px #3E481D0D, 0 4px 8px #3E481D1A',- '--shadow-med':- '0 2px 4px #3E481D0D, 0 4px 12px #3E481D1A',- '--shadow-high':- '0 4px 6px #3E481D1A, 0 12px 24px #3E481D26',+ '--shadow-low': '0 2px 4px #3E481D0D, 0 4px 8px #3E481D1A',+ '--shadow-med': '0 2px 4px #3E481D0D, 0 4px 12px #3E481D1A',+ '--shadow-high': '0 4px 6px #3E481D1A, 0 12px 24px #3E481D26','--shadow-inset-hover': 'inset 0px 0px 0px 2px #3E481D30','--shadow-inset-selected': 'inset 0px 0px 0px 2px #3E481D50','--shadow-inset-success': 'inset 0px 0px 0px 2px #4D990050',diff --git a/packages/themes/y2k/README.md b/packages/themes/y2k/README.mdindex 9e7363ebec..13e736e5fb 100644--- a/packages/themes/y2k/README.md+++ b/packages/themes/y2k/README.md@@ -1,14 +1,64 @@# @xds/theme-y2k-Bubbly Y2K pop theme for XDS: hot pink body, lime green accents, Poppins body text, and playful categorical colors derived from HCT tonal palettes.+Playful Y2K pop theme for XDS: a soft periwinkle body, charcoal accent, holographic categorical colors derived from HCT tonal palettes, Poppins for body/headings, and a Crimson Text serif for display sizes.## Install+```bash+npm install @xds/theme-y2k+```++## Usage++Wrap your app with `XDSTheme` and pass the theme:+```tsx-import {y2kTheme} from '@xds/theme-y2k';-import '@xds/theme-y2k/theme.css';+import {XDSTheme} from '@xds/core/theme';+import {y2kTheme} from '@xds/theme-y2k/built';-<XDSTheme theme={y2kTheme}>- <App />-</XDSTheme>+function App() {+ return <XDSTheme theme={y2kTheme}>{/* your app */}</XDSTheme>;+}```++### Import paths++| Path | Use case |+| -------------------------- | ------------------------------------------------------ |+| `@xds/theme-y2k` | Source build (StyleX compilation via `@xds/build`) |+| `@xds/theme-y2k/built` | Pre-built dist (Tailwind, plain CSS, or no build step) |+| `@xds/theme-y2k/theme.css` | Pre-built CSS file (import in your stylesheet) |++If you're using `@xds/build` for StyleX source compilation, import from the bare path. Otherwise, use `/built`.++### CSS import++Add the theme CSS to your stylesheet:++```css+@import '@xds/theme-y2k/theme.css';+```++## Fonts++This theme uses custom typefaces:++| Role | Font |+| --------------- | -------------- |+| Body / Headings | Poppins |+| Display | Crimson Text |+| Code | JetBrains Mono |++**These fonts must be loaded separately.** The theme references them by name but does not bundle the font files.++Add this to your HTML `<head>`:++```html+<link rel="preconnect" href="https://fonts.googleapis.com" />+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />+<link+ rel="stylesheet"+ href="https://fonts.googleapis.com/css2?family=Crimson+Text:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&family=JetBrains+Mono:wght@400;500;600;700&family=Poppins:wght@400;500;600;700&display=swap" />+```++Without this, the theme falls back to system fonts (Crimson Text falls back to a serif).diff --git a/packages/themes/y2k/src/y2kTheme.ts b/packages/themes/y2k/src/y2kTheme.tsindex 20985d4d95..426506e049 100644--- a/packages/themes/y2k/src/y2kTheme.ts+++ b/packages/themes/y2k/src/y2kTheme.ts@@ -4,7 +4,8 @@* Y2K Theme** A bubbly, playful pop theme inspired by early 2000s aesthetics.- * Cream body, charcoal accent, Poppins + Crimson Text typography.+ * Periwinkle body (#CCCFFA), charcoal accent, Poppins for body/headings, and+ * Crimson Text for display sizes.* Core neutral: H=75 C=8 (warm cream neutral derived from #FFF6ED)*/@@ -89,7 +90,7 @@ export const y2kTheme = defineTheme({'--color-accent-muted': ['#2d241b14', '#fbefe220'],'--color-neutral': ['#2d241b10', '#fbefe21A'],'--color-background-surface': ['#FFFFFF', '#221a10'],- '--color-background-body': ['#FFF6ED', '#190f00'],+ '--color-background-body': ['#CCCFFA', '#190f00'],'--color-overlay': ['#2d241b80', '#2d241bCC'],'--color-overlay-hover': ['#2d241b0D', '#fbefe20D'],'--color-overlay-pressed': ['#2d241b1A', '#fbefe21A'],@@ -126,9 +127,10 @@ export const y2kTheme = defineTheme({'--color-warning': ['#FFE08A', '#FFE08A'],'--color-warning-muted': ['#FFE08A', '#FFE08A'],- // Border — neutral H=75 (cream)- '--color-border': ['#ede0d4', '#fbefe21A'],- '--color-border-emphasized': ['#675d52', '#5b5146'],+ // Bold charcoal borders in light mode (default + card) for the heavy-outline+ // Y2K look. Dark mode unchanged.+ '--color-border': ['#2F292E', '#fbefe21A'],+ '--color-border-emphasized': ['#2F292E', '#5b5146'],// Effects'--color-skeleton': ['#d1c5b8', '#5b5146'],@@ -203,12 +205,9 @@ export const y2kTheme = defineTheme({// =========================================================================// Shadows — warm cream neutral// =========================================================================- '--shadow-low':- '0 2px 4px #2d241b0D, 0 4px 8px #2d241b1A',- '--shadow-med':- '0 2px 4px #2d241b0D, 0 4px 12px #2d241b1A',- '--shadow-high':- '0 4px 6px #2d241b1A, 0 12px 24px #2d241b26',+ '--shadow-low': '0 2px 4px #2d241b0D, 0 4px 8px #2d241b1A',+ '--shadow-med': '0 2px 4px #2d241b0D, 0 4px 12px #2d241b1A',+ '--shadow-high': '0 4px 6px #2d241b1A, 0 12px 24px #2d241b26','--shadow-inset-hover': 'inset 0px 0px 0px 2px #2d241b30','--shadow-inset-selected': 'inset 0px 0px 0px 2px #2d241b50','--shadow-inset-success': 'inset 0px 0px 0px 2px #3a550050',@@ -217,6 +216,34 @@ export const y2kTheme = defineTheme({},components: {+ // Display sizes use a Crimson Text serif, distinct from the Poppins+ // used for body/headings.+ text: {+ 'type:display-1': {+ fontFamily: '"Crimson Text", Georgia, "Times New Roman", Times, serif',+ },+ 'type:display-2': {+ fontFamily: '"Crimson Text", Georgia, "Times New Roman", Times, serif',+ },+ 'type:display-3': {+ fontFamily: '"Crimson Text", Georgia, "Times New Roman", Times, serif',+ },+ },++ // TopNav items: drop the pill background on the selected state and rely on+ // weight + primary text color for emphasis. Hover/active keep the neutral+ // overlay from the base styles.+ 'top-nav-item': {+ selected: {+ backgroundColor: 'transparent',+ ':hover': {+ backgroundColor: 'var(--color-overlay-hover)',+ },+ ':active': {+ backgroundColor: 'var(--color-overlay-pressed)',+ },+ },+ },button: {base: {borderRadius: '0px',@@ -316,7 +343,6 @@ export const y2kTheme = defineTheme({},},-card: {base: {borderRadius: '0px',@@ -339,83 +365,253 @@ export const y2kTheme = defineTheme({*/export const y2kPalettes = {neutral: {- hue: 75, chroma: 8,- 0: '#000000', 5: '#190f00', 10: '#221a10', 15: '#2d241b', 20: '#382f25',- 25: '#433a30', 30: '#4f453b', 35: '#5b5146', 40: '#675d52', 45: '#73695e',- 50: '#80756a', 55: '#8d8276', 60: '#9a8f83', 65: '#a79c90', 70: '#b5a99d',- 75: '#c3b7ab', 80: '#d1c5b8', 85: '#dfd2c6', 90: '#ede0d4', 95: '#fbefe2',+ hue: 75,+ chroma: 8,+ 0: '#000000',+ 5: '#190f00',+ 10: '#221a10',+ 15: '#2d241b',+ 20: '#382f25',+ 25: '#433a30',+ 30: '#4f453b',+ 35: '#5b5146',+ 40: '#675d52',+ 45: '#73695e',+ 50: '#80756a',+ 55: '#8d8276',+ 60: '#9a8f83',+ 65: '#a79c90',+ 70: '#b5a99d',+ 75: '#c3b7ab',+ 80: '#d1c5b8',+ 85: '#dfd2c6',+ 90: '#ede0d4',+ 95: '#fbefe2',100: '#ffffff',},green: {- hue: 120, chroma: 60,- 0: '#000000', 5: '#061800', 10: '#132200', 15: '#152d00', 20: '#173900',- 25: '#1e4500', 30: '#285100', 35: '#355d00', 40: '#426900', 45: '#4f7600',- 50: '#5c830b', 55: '#69901d', 60: '#779d2c', 65: '#84aa39', 70: '#92b847',- 75: '#a0c654', 80: '#aed461', 85: '#bce26e', 90: '#caf07b', 95: '#d9fe89',+ hue: 120,+ chroma: 60,+ 0: '#000000',+ 5: '#061800',+ 10: '#132200',+ 15: '#152d00',+ 20: '#173900',+ 25: '#1e4500',+ 30: '#285100',+ 35: '#355d00',+ 40: '#426900',+ 45: '#4f7600',+ 50: '#5c830b',+ 55: '#69901d',+ 60: '#779d2c',+ 65: '#84aa39',+ 70: '#92b847',+ 75: '#a0c654',+ 80: '#aed461',+ 85: '#bce26e',+ 90: '#caf07b',+ 95: '#d9fe89',100: '#ffffff',},red: {- hue: 25, chroma: 55,- 0: '#000000', 5: '#480000', 10: '#540000', 15: '#620002', 20: '#700012',- 25: '#7f001b', 30: '#8e1126', 35: '#9c2330', 40: '#ab313b', 45: '#ba3f47',- 50: '#c94d52', 55: '#d95b5e', 60: '#e8686b', 65: '#f87677', 70: '#ff8787',- 75: '#ff9d9b', 80: '#ffb2af', 85: '#ffc6c3', 90: '#ffd9d7', 95: '#ffeceb',+ hue: 25,+ chroma: 55,+ 0: '#000000',+ 5: '#480000',+ 10: '#540000',+ 15: '#620002',+ 20: '#700012',+ 25: '#7f001b',+ 30: '#8e1126',+ 35: '#9c2330',+ 40: '#ab313b',+ 45: '#ba3f47',+ 50: '#c94d52',+ 55: '#d95b5e',+ 60: '#e8686b',+ 65: '#f87677',+ 70: '#ff8787',+ 75: '#ff9d9b',+ 80: '#ffb2af',+ 85: '#ffc6c3',+ 90: '#ffd9d7',+ 95: '#ffeceb',100: '#ffffff',},yellow: {- hue: 85, chroma: 65,- 0: '#000000', 5: '#270c00', 10: '#301800', 15: '#3b2200', 20: '#472c00',- 25: '#533700', 30: '#604200', 35: '#6d4d00', 40: '#7b5900', 45: '#896500',- 50: '#977100', 55: '#a67e00', 60: '#b58b01', 65: '#c39819', 70: '#d2a52a',- 75: '#e2b239', 80: '#f1c047', 85: '#ffcd55', 90: '#ffde9b', 95: '#ffeecf',+ hue: 85,+ chroma: 65,+ 0: '#000000',+ 5: '#270c00',+ 10: '#301800',+ 15: '#3b2200',+ 20: '#472c00',+ 25: '#533700',+ 30: '#604200',+ 35: '#6d4d00',+ 40: '#7b5900',+ 45: '#896500',+ 50: '#977100',+ 55: '#a67e00',+ 60: '#b58b01',+ 65: '#c39819',+ 70: '#d2a52a',+ 75: '#e2b239',+ 80: '#f1c047',+ 85: '#ffcd55',+ 90: '#ffde9b',+ 95: '#ffeecf',100: '#ffffff',},blue: {- hue: 250, chroma: 40,- 0: '#000000', 5: '#001939', 10: '#002244', 15: '#002c4d', 20: '#003759',- 25: '#004266', 30: '#004e74', 35: '#005a83', 40: '#006693', 45: '#0073a3',- 50: '#0080b4', 55: '#008ec4', 60: '#0e9bd2', 65: '#2fa8e0', 70: '#45b6ef',- 75: '#57c3fd', 80: '#7ed0ff', 85: '#a3dbff', 90: '#c4e7ff', 95: '#e1f3ff',+ hue: 250,+ chroma: 40,+ 0: '#000000',+ 5: '#001939',+ 10: '#002244',+ 15: '#002c4d',+ 20: '#003759',+ 25: '#004266',+ 30: '#004e74',+ 35: '#005a83',+ 40: '#006693',+ 45: '#0073a3',+ 50: '#0080b4',+ 55: '#008ec4',+ 60: '#0e9bd2',+ 65: '#2fa8e0',+ 70: '#45b6ef',+ 75: '#57c3fd',+ 80: '#7ed0ff',+ 85: '#a3dbff',+ 90: '#c4e7ff',+ 95: '#e1f3ff',100: '#ffffff',},pink: {- hue: 350, chroma: 45,- 0: '#000000', 5: '#3d001d', 10: '#490027', 15: '#560032', 20: '#64003d',- 25: '#711248', 30: '#7f2154', 35: '#8c2f60', 40: '#9a3c6c', 45: '#a84979',- 50: '#b75685', 55: '#c56392', 60: '#d371a0', 65: '#e27ead', 70: '#f18bbb',- 75: '#ff99c8', 80: '#ffaed3', 85: '#ffc3de', 90: '#ffd7e9', 95: '#ffebf4',+ hue: 350,+ chroma: 45,+ 0: '#000000',+ 5: '#3d001d',+ 10: '#490027',+ 15: '#560032',+ 20: '#64003d',+ 25: '#711248',+ 30: '#7f2154',+ 35: '#8c2f60',+ 40: '#9a3c6c',+ 45: '#a84979',+ 50: '#b75685',+ 55: '#c56392',+ 60: '#d371a0',+ 65: '#e27ead',+ 70: '#f18bbb',+ 75: '#ff99c8',+ 80: '#ffaed3',+ 85: '#ffc3de',+ 90: '#ffd7e9',+ 95: '#ffebf4',100: '#ffffff',},purple: {- hue: 300, chroma: 40,- 0: '#000000', 5: '#020840', 10: '#11144b', 15: '#1f1e57', 20: '#2c2864',- 25: '#393370', 30: '#453e7d', 35: '#524a8a', 40: '#5f5697', 45: '#6c62a4',- 50: '#796eb2', 55: '#867bc0', 60: '#9387ce', 65: '#a194dc', 70: '#afa2ea',- 75: '#bdaff8', 80: '#cbbeff', 85: '#d9ceff', 90: '#e6deff', 95: '#f3eeff',+ hue: 300,+ chroma: 40,+ 0: '#000000',+ 5: '#020840',+ 10: '#11144b',+ 15: '#1f1e57',+ 20: '#2c2864',+ 25: '#393370',+ 30: '#453e7d',+ 35: '#524a8a',+ 40: '#5f5697',+ 45: '#6c62a4',+ 50: '#796eb2',+ 55: '#867bc0',+ 60: '#9387ce',+ 65: '#a194dc',+ 70: '#afa2ea',+ 75: '#bdaff8',+ 80: '#cbbeff',+ 85: '#d9ceff',+ 90: '#e6deff',+ 95: '#f3eeff',100: '#ffffff',},cyan: {- hue: 185, chroma: 35,- 0: '#000000', 5: '#001e14', 10: '#00261f', 15: '#003029', 20: '#003b34',- 25: '#00473f', 30: '#00534a', 35: '#005f56', 40: '#006c62', 45: '#00796f',- 50: '#00867b', 55: '#0f9488', 60: '#29a195', 65: '#3bafa2', 70: '#4cbcb0',- 75: '#5bcabd', 80: '#6ad8cb', 85: '#79e7d9', 90: '#87f5e7', 95: '#a6fff5',+ hue: 185,+ chroma: 35,+ 0: '#000000',+ 5: '#001e14',+ 10: '#00261f',+ 15: '#003029',+ 20: '#003b34',+ 25: '#00473f',+ 30: '#00534a',+ 35: '#005f56',+ 40: '#006c62',+ 45: '#00796f',+ 50: '#00867b',+ 55: '#0f9488',+ 60: '#29a195',+ 65: '#3bafa2',+ 70: '#4cbcb0',+ 75: '#5bcabd',+ 80: '#6ad8cb',+ 85: '#79e7d9',+ 90: '#87f5e7',+ 95: '#a6fff5',100: '#ffffff',},orange: {- hue: 60, chroma: 60,- 0: '#000000', 5: '#340000', 10: '#420500', 15: '#520b00', 20: '#601700',- 25: '#6d2400', 30: '#7b3000', 35: '#893c00', 40: '#984800', 45: '#a75409',- 50: '#b66019', 55: '#c56d26', 60: '#d47a33', 65: '#e48740', 70: '#f3944c',- 75: '#ffa25c', 80: '#ffb682', 85: '#ffc9a3', 90: '#ffdbc3', 95: '#ffede1',+ hue: 60,+ chroma: 60,+ 0: '#000000',+ 5: '#340000',+ 10: '#420500',+ 15: '#520b00',+ 20: '#601700',+ 25: '#6d2400',+ 30: '#7b3000',+ 35: '#893c00',+ 40: '#984800',+ 45: '#a75409',+ 50: '#b66019',+ 55: '#c56d26',+ 60: '#d47a33',+ 65: '#e48740',+ 70: '#f3944c',+ 75: '#ffa25c',+ 80: '#ffb682',+ 85: '#ffc9a3',+ 90: '#ffdbc3',+ 95: '#ffede1',100: '#ffffff',},teal: {- hue: 165, chroma: 30,- 0: '#000000', 5: '#001d00', 10: '#00240f', 15: '#002f1a', 20: '#003a24',- 25: '#00462f', 30: '#00513a', 35: '#115e45', 40: '#226a51', 45: '#30775d',- 50: '#3d8469', 55: '#4a9175', 60: '#589e82', 65: '#65ab8f', 70: '#72b99c',- 75: '#7fc7a9', 80: '#8dd5b7', 85: '#9be3c5', 90: '#a9f2d3', 95: '#b6ffe1',+ hue: 165,+ chroma: 30,+ 0: '#000000',+ 5: '#001d00',+ 10: '#00240f',+ 15: '#002f1a',+ 20: '#003a24',+ 25: '#00462f',+ 30: '#00513a',+ 35: '#115e45',+ 40: '#226a51',+ 45: '#30775d',+ 50: '#3d8469',+ 55: '#4a9175',+ 60: '#589e82',+ 65: '#65ab8f',+ 70: '#72b99c',+ 75: '#7fc7a9',+ 80: '#8dd5b7',+ 85: '#9be3c5',+ 90: '#a9f2d3',+ 95: '#b6ffe1',100: '#ffffff',},} as const;