Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

feat(tokens): rename design tokens per naming audit (#698)

Cindy Zhang76d41bfc8bec
diff --git a/.claude/commands/create-theme.md b/.claude/commands/create-theme.md
index e29b4d4671..bcea5b208d 100644
--- a/.claude/commands/create-theme.md
+++ b/.claude/commands/create-theme.md
@@ -59,14 +59,14 @@ export const {themeName}Theme = defineTheme({
tokens: {
// Colors — use [light, dark] tuples for automatic light-dark() conversion
'--color-accent': ['#YOUR_LIGHT', '#YOUR_DARK'],
- '--color-accent-deemphasized': ['#YOUR_LIGHT33', '#YOUR_DARK3F'],
+ '--color-accent-muted': ['#YOUR_LIGHT33', '#YOUR_DARK3F'],
'--color-surface': ['#FFFFFF', '#1C1C1C'],
'--color-wash': ['#F5F5F5', '#121212'],
// Radius — customize for different feel
- '--radius-container': '12px',
- '--radius-element': '8px',
- '--radius-content': '4px',
+ '--radius-3': '12px',
+ '--radius-2': '8px',
+ '--radius-1': '4px',
// Typography — font families
'--font-body': '-apple-system, BlinkMacSystemFont, sans-serif',
diff --git a/apps/example-nextjs-tailwind/src/app/page.tsx b/apps/example-nextjs-tailwind/src/app/page.tsx
index c43d89c0cc..22013c416e 100644
--- a/apps/example-nextjs-tailwind/src/app/page.tsx
+++ b/apps/example-nextjs-tailwind/src/app/page.tsx
@@ -15,7 +15,10 @@ export default function Home() {
<XDSVStack gap={2}>
<XDSHeading level={1}>XDS + Tailwind (Dist Build)</XDSHeading>
<XDSText type="body" color="secondary">
- This example consumes <XDSText type="body" weight="bold">@xds/core</XDSText>{' '}
+ This example consumes{' '}
+ <XDSText type="body" weight="bold">
+ @xds/core
+ </XDSText>{' '}
as a pre-built dist package — no StyleX build plugin needed.
Custom layout uses Tailwind utility classes. XDS handles
components, theming, and design tokens.
@@ -52,10 +55,7 @@ export default function Home() {
{/* Text Input */}
<XDSVStack gap={3}>
<XDSHeading level={2}>Text Input</XDSHeading>
- <XDSTextInput
- label="Email address"
- placeholder="[email protected]"
- />
+ <XDSTextInput label="Email address" placeholder="[email protected]" />
</XDSVStack>
<XDSDivider />
@@ -63,10 +63,10 @@ export default function Home() {
{/* Tailwind custom styling */}
<XDSVStack gap={3}>
<XDSHeading level={2}>Tailwind Integration</XDSHeading>
- <div className="rounded-lg border border-[var(--color-divider)] p-4 bg-[var(--color-wash)]">
+ <div className="rounded-lg border border-[var(--color-border)] p-4 bg-[var(--color-wash)]">
<XDSText type="body">
- This card uses Tailwind utilities for layout with XDS
- design tokens via CSS custom properties. No StyleX needed.
+ This card uses Tailwind utilities for layout with XDS design
+ tokens via CSS custom properties. No StyleX needed.
</XDSText>
</div>
</XDSVStack>
diff --git a/apps/sandbox/src/app/(fullscreen)/pages/shell-lab/page.tsx b/apps/sandbox/src/app/(fullscreen)/pages/shell-lab/page.tsx
index 0fec286925..a23bb6e464 100644
--- a/apps/sandbox/src/app/(fullscreen)/pages/shell-lab/page.tsx
+++ b/apps/sandbox/src/app/(fullscreen)/pages/shell-lab/page.tsx
@@ -784,7 +784,7 @@ export default function ShellLabPage() {
width: '100%',
padding: '8px 12px',
borderRadius: 8,
- border: '1px solid var(--color-divider)',
+ border: '1px solid var(--color-border)',
background: 'var(--color-wash)',
fontSize: 14,
outline: 'none',
diff --git a/apps/sandbox/src/app/(sandbox)/pages/mega-menu/page.tsx b/apps/sandbox/src/app/(sandbox)/pages/mega-menu/page.tsx
index 9bd58290a5..86d242c14e 100644
--- a/apps/sandbox/src/app/(sandbox)/pages/mega-menu/page.tsx
+++ b/apps/sandbox/src/app/(sandbox)/pages/mega-menu/page.tsx
@@ -54,7 +54,7 @@ const styles = stylex.create({
featuredLink: {
fontSize: 14,
fontWeight: 600,
- color: 'var(--color-accent-text)',
+ color: 'var(--color-text-link)',
textDecoration: 'none',
},
featuredImage: {
diff --git a/apps/sandbox/src/app/Sidebar.tsx b/apps/sandbox/src/app/Sidebar.tsx
index 46f7b694a8..58856e2488 100644
--- a/apps/sandbox/src/app/Sidebar.tsx
+++ b/apps/sandbox/src/app/Sidebar.tsx
@@ -21,7 +21,7 @@ export function Sidebar() {
<nav
style={{
width: 220,
- borderRight: '1px solid var(--color-divider, #e0e0e0)',
+ borderRight: '1px solid var(--color-border, #e0e0e0)',
padding: '1.5rem 1rem',
display: 'flex',
flexDirection: 'column',
@@ -55,7 +55,7 @@ export function Sidebar() {
fontSize: '0.875rem',
color: 'var(--color-text-primary, #333)',
backgroundColor: isActive
- ? 'var(--color-hover-overlay, #f0f0f0)'
+ ? 'var(--color-overlay-hover, #f0f0f0)'
: 'transparent',
fontWeight: isActive ? 600 : 400,
}}>
diff --git a/apps/storybook/stories/Field.stories.tsx b/apps/storybook/stories/Field.stories.tsx
index eb498b2cf1..f797ef4f30 100644
--- a/apps/storybook/stories/Field.stories.tsx
+++ b/apps/storybook/stories/Field.stories.tsx
@@ -21,7 +21,7 @@ const inputStyles = stylex.create({
paddingInline: spacingVars['--spacing-3'],
borderWidth: 1,
borderStyle: 'solid',
- borderColor: colorVars['--color-divider'],
+ borderColor: colorVars['--color-border'],
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
color: colorVars['--color-text-primary'],
diff --git a/apps/storybook/stories/Grid.stories.tsx b/apps/storybook/stories/Grid.stories.tsx
index 068bff843a..b146523f28 100644
--- a/apps/storybook/stories/Grid.stories.tsx
+++ b/apps/storybook/stories/Grid.stories.tsx
@@ -23,7 +23,7 @@ const styles = stylex.create({
},
featuredItem: {
padding: spacingVars['--spacing-6'],
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
borderRadius: radiusVars['--radius-2'],
textAlign: 'center',
height: '100%',
diff --git a/apps/storybook/stories/Layout.stories.tsx b/apps/storybook/stories/Layout.stories.tsx
index 97ace183f2..1d19b59f7d 100644
--- a/apps/storybook/stories/Layout.stories.tsx
+++ b/apps/storybook/stories/Layout.stories.tsx
@@ -70,12 +70,12 @@ const styles = stylex.create({
fontSize: 14,
backgroundColor: {
default: 'transparent',
- ':hover': colorVars['--color-hover-overlay'],
+ ':hover': colorVars['--color-overlay-hover'],
},
},
navItemActive: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
- color: colorVars['--color-accent-text'],
+ backgroundColor: colorVars['--color-accent-muted'],
+ color: colorVars['--color-text-link'],
},
// Content placeholder
placeholder: {
diff --git a/apps/storybook/stories/ThemeEditor.stories.tsx b/apps/storybook/stories/ThemeEditor.stories.tsx
index b1511e6fca..095620de0b 100644
--- a/apps/storybook/stories/ThemeEditor.stories.tsx
+++ b/apps/storybook/stories/ThemeEditor.stories.tsx
@@ -34,7 +34,7 @@ import {
sizeDefaults,
shadowDefaults,
durationDefaults,
- easingDefaults,
+ easeDefaults,
transitionDefaults,
} from '@xds/core/theme';
import {defaultIconRegistry} from '@xds/theme-default';
@@ -88,7 +88,7 @@ const TOKEN_GROUPS = {
easing: {
label: 'Easing',
description: 'Motion easing tokens',
- tokens: easingDefaults,
+ tokens: easeDefaults,
},
} as const;
@@ -101,58 +101,51 @@ type TokenGroupKey = keyof typeof TOKEN_GROUPS;
const COLOR_CATEGORIES = {
'Core Semantic': [
'--color-accent',
- '--color-accent-deemphasized',
- '--color-accent-text',
+ '--color-accent-muted',
+ '--color-secondary',
'--color-surface',
'--color-wash',
'--color-overlay',
],
'Interactive States': [
- '--color-hover-overlay',
- '--color-pressed-overlay',
- '--color-focus-outline',
- '--color-focus-outline-error',
- '--color-focus-outline-success',
- '--color-focus-outline-warning',
- '--color-deemphasized',
+ '--color-overlay-hover',
+ '--color-overlay-pressed',
+ '--color-ring-focus',
+ '--color-ring-focus-error',
+ '--color-ring-focus-success',
+ '--color-ring-focus-warning',
+ '--color-muted',
],
Text: [
'--color-text-primary',
'--color-text-secondary',
'--color-text-disabled',
'--color-text-link',
- '--color-text-placeholder',
- '--color-text-on-media',
+ '--color-text-on-dark-media',
],
Icon: [
'--color-icon-primary',
'--color-icon-secondary',
- '--color-icon-tertiary',
'--color-icon-disabled',
- '--color-icon-on-media',
+ '--color-icon-on-dark-media',
],
'Surface Variants': ['--color-card', '--color-popover', '--color-navbar'],
'Status/Sentiment': [
- '--color-positive',
- '--color-positive-deemphasized',
- '--color-negative',
- '--color-negative-deemphasized',
+ '--color-success',
+ '--color-success-muted',
+ '--color-error',
+ '--color-error-muted',
'--color-warning',
- '--color-warning-deemphasized',
- '--color-educational',
- '--color-educational-deemphasized',
+ '--color-warning-muted',
+ '--color-info',
+ '--color-info-muted',
],
Divider: [
- '--color-divider',
- '--color-divider-high-contrast',
- '--color-divider-emphasized',
- ],
- Effects: [
- '--color-glimmer',
- '--color-glimmer-high-contrast',
- '--color-shadow-elevation',
- '--color-hover-tint',
+ '--color-border',
+ '--color-border-strong',
+ '--color-border-emphasized',
],
+ Effects: ['--color-skeleton', '--color-shadow', '--color-hover-tint'],
'Palette: Blue': [
'--color-blue-background',
'--color-blue-border',
@@ -452,7 +445,7 @@ function ColorSwatch({tokenName, value, onChange, mode}: ColorSwatchProps) {
height: '32px',
borderRadius: '6px',
backgroundColor: displayValue,
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
flexShrink: 0,
// Checkerboard pattern for alpha preview
backgroundImage:
@@ -522,7 +515,7 @@ function ColorSwatch({tokenName, value, onChange, mode}: ColorSwatchProps) {
padding: '4px 6px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -554,7 +547,7 @@ function ColorSwatch({tokenName, value, onChange, mode}: ColorSwatchProps) {
padding: '4px 8px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -621,7 +614,7 @@ function SpacingEditor({tokenName, value, onChange}: SpacingEditorProps) {
padding: '4px 8px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -685,7 +678,7 @@ function RadiusEditor({tokenName, value, onChange}: RadiusEditorProps) {
padding: '4px 8px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -761,7 +754,7 @@ function TypographyEditor({tokenName, value, onChange}: TypographyEditorProps) {
padding: '4px 8px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -874,7 +867,7 @@ function ComponentPreview() {
padding: '16px',
borderRadius: 'var(--radius-2)',
backgroundColor: 'var(--color-wash)',
- border: '1px solid var(--color-divider)',
+ border: '1px solid var(--color-border)',
fontFamily: 'var(--font-code)',
fontSize: 'var(--text-sm)',
lineHeight: 'var(--leading-normal)',
@@ -897,7 +890,7 @@ const styles = stylex.create({
const styles = stylex.create({
button: {
backgroundColor: colorVars['--color-accent'],
- color: colorVars['--color-text-on-media'],
+ color: colorVars['--color-text-on-dark-media'],
},
});`}
</code>
@@ -1322,7 +1315,7 @@ function ThemeEditorComponent() {
...sizeDefaults,
...shadowDefaults,
...durationDefaults,
- ...easingDefaults,
+ ...easeDefaults,
...transitionDefaults,
}),
[],
@@ -1569,7 +1562,7 @@ function ThemeEditorComponent() {
style={{
padding: '8px 12px',
borderRadius: '6px',
- border: '1px solid var(--color-divider)',
+ border: '1px solid var(--color-border)',
backgroundColor: 'var(--color-surface)',
display: 'flex',
flexDirection: 'column',
@@ -1697,7 +1690,7 @@ function ThemeEditorComponent() {
padding: '16px',
borderRadius: '8px',
backgroundColor: 'var(--color-wash)',
- border: '1px solid var(--color-divider)',
+ border: '1px solid var(--color-border)',
marginBottom: '8px',
}}>
<div
@@ -1769,7 +1762,7 @@ function ThemeEditorComponent() {
padding: '4px 8px',
fontSize: '12px',
fontFamily: 'var(--font-code)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
borderRadius: '4px',
backgroundColor: 'var(--color-surface)',
color: 'var(--color-text-primary)',
@@ -1794,7 +1787,7 @@ function ThemeEditorComponent() {
<div
style={{
width: '400px',
- borderRight: '1px solid var(--color-divider-emphasized)',
+ borderRight: '1px solid var(--color-border-emphasized)',
display: 'flex',
flexDirection: 'column',
backgroundColor: 'var(--color-surface)',
@@ -1803,7 +1796,7 @@ function ThemeEditorComponent() {
<div
style={{
padding: '16px 16px 12px',
- borderBottom: '1px solid var(--color-divider)',
+ borderBottom: '1px solid var(--color-border)',
display: 'flex',
gap: '4px',
flexWrap: 'wrap',
@@ -1823,7 +1816,7 @@ function ThemeEditorComponent() {
<div
style={{
padding: '12px 16px',
- borderBottom: '1px solid var(--color-divider)',
+ borderBottom: '1px solid var(--color-border)',
}}>
<XDSText type="supporting">
{TOKEN_GROUPS[activeGroup].description}
@@ -1844,7 +1837,7 @@ function ThemeEditorComponent() {
<div
style={{
padding: '16px',
- borderTop: '1px solid var(--color-divider)',
+ borderTop: '1px solid var(--color-border)',
display: 'flex',
gap: '8px',
}}>
@@ -1869,7 +1862,7 @@ function ThemeEditorComponent() {
<div
style={{
padding: '12px 24px',
- borderBottom: '1px solid var(--color-divider)',
+ borderBottom: '1px solid var(--color-border)',
backgroundColor: 'var(--color-surface)',
display: 'flex',
alignItems: 'center',
@@ -1897,7 +1890,7 @@ function ThemeEditorComponent() {
<div
style={{
padding: '16px 24px',
- borderBottom: '1px solid var(--color-divider)',
+ borderBottom: '1px solid var(--color-border)',
backgroundColor: 'var(--color-wash)',
maxHeight: '300px',
overflow: 'auto',
@@ -1912,7 +1905,7 @@ function ThemeEditorComponent() {
padding: '16px',
borderRadius: '8px',
backgroundColor: 'var(--color-surface)',
- border: '1px solid var(--color-divider-emphasized)',
+ border: '1px solid var(--color-border-emphasized)',
fontSize: '12px',
fontFamily: 'var(--font-code)',
overflow: 'auto',
diff --git a/internal/eslint-plugin-xds/README.md b/internal/eslint-plugin-xds/README.md
index fce97c3203..53b392b840 100644
--- a/internal/eslint-plugin-xds/README.md
+++ b/internal/eslint-plugin-xds/README.md
@@ -49,7 +49,7 @@ const styles = stylex.create({
text: {
fontSize: textSizeVars['--text-base'], // ✅ Token
fontWeight: fontWeightVars['--font-weight-semibold'], // ✅ Token
- color: colorVars['--color-negative'], // ✅ Token
+ color: colorVars['--color-error'], // ✅ Token
},
});
```
diff --git a/internal/stylex-capabilities/CAPABILITIES.md b/internal/stylex-capabilities/CAPABILITIES.md
index 7700771bb2..39f7a39046 100644
--- a/internal/stylex-capabilities/CAPABILITIES.md
+++ b/internal/stylex-capabilities/CAPABILITIES.md
@@ -101,7 +101,7 @@ ltr: "@media (h` |
| Feature | Status | CSS Output |
| --------------------------------- | ------ | ---------------------------------------------------------- |
-| CSS variables (custom properties) | ✅ | `ltr: ".x14qql8p{color:var(--color-primary)}",` |
+| CSS variables (custom properties) | ✅ | `ltr: ".x14qql8p{color:var(--color-accent)}",` |
| calc() | ✅ | `ltr: ".xkxa9zd{width:calc(100% - 32px)}",` |
| clamp() | ✅ | `ltr: ".xdq3cbq{font-size:clamp(14px,2vw,18px)}",` |
| light-dark() | ✅ | `ltr: ".xarbrzd{color:light-dark(black,white)}",` |
diff --git a/internal/stylex-capabilities/scan.mjs b/internal/stylex-capabilities/scan.mjs
index 879a3bbd34..5b660caf26 100644
--- a/internal/stylex-capabilities/scan.mjs
+++ b/internal/stylex-capabilities/scan.mjs
@@ -250,7 +250,7 @@ const s = stylex.create({ t: { color: { default: 'red', ':hover': 'blue' }, '@me
category: 'CSS Values',
name: 'CSS variables (custom properties)',
code: `import * as stylex from '@stylexjs/stylex';
-const s = stylex.create({ t: { color: 'var(--color-primary)' } });`,
+const s = stylex.create({ t: { color: 'var(--color-accent)' } });`,
},
{
category: 'CSS Values',
diff --git a/internal/vibe-tests/.generated/xds-tailwind-skill.md b/internal/vibe-tests/.generated/xds-tailwind-skill.md
index 83a9260487..b37e5c6c7f 100644
--- a/internal/vibe-tests/.generated/xds-tailwind-skill.md
+++ b/internal/vibe-tests/.generated/xds-tailwind-skill.md
@@ -220,8 +220,8 @@ XDS provides CSS custom properties you can reference alongside Tailwind utilitie
| var(--color-accent) | Primary action color |
| var(--color-surface) | Background surface |
| var(--color-wash) | Secondary background |
-| var(--color-positive) | Success states |
-| var(--color-negative) | Error states |
+| var(--color-success) | Success states |
+| var(--color-error) | Error states |
| var(--color-warning) | Warning states |
| var(--color-text-primary) | Main text |
| var(--color-text-secondary) | Secondary text |
@@ -229,12 +229,12 @@ XDS provides CSS custom properties you can reference alongside Tailwind utilitie
### Radius Tokens
-| Token | Value | Usage |
-| ----------------------- | ------ | --------------- |
-| var(--radius-rounded) | 9999px | Pills, avatars |
-| var(--radius-container) | 12px | Cards, modals |
-| var(--radius-element) | 8px | Buttons, inputs |
-| var(--radius-content) | 4px | Small elements |
+| Token | Value | Usage |
+| --------------------- | ------ | --------------- |
+| var(--radius-rounded) | 9999px | Pills, avatars |
+| var(--radius-3) | 12px | Cards, modals |
+| var(--radius-2) | 8px | Buttons, inputs |
+| var(--radius-1) | 4px | Small elements |
### Size Tokens
@@ -249,7 +249,7 @@ XDS provides CSS custom properties you can reference alongside Tailwind utilitie
You can reference XDS tokens in Tailwind arbitrary values:
```tsx
-<div className="p-[var(--spacing-4)] bg-[var(--color-surface)] rounded-[var(--radius-container)]">
+<div className="p-[var(--spacing-4)] bg-[var(--color-surface)] rounded-[var(--radius-3)]">
Content
</div>
```
@@ -257,8 +257,8 @@ You can reference XDS tokens in Tailwind arbitrary values:
Or simply use Tailwind's built-in scale which maps closely:
- `p-4` ≈ var(--spacing-4) (16px)
-- `rounded-xl` ≈ var(--radius-container) (12px)
-- `rounded-lg` ≈ var(--radius-element) (8px)
+- `rounded-xl` ≈ var(--radius-3) (12px)
+- `rounded-lg` ≈ var(--radius-2) (8px)
## Theme System
diff --git a/internal/vibe-tests/app/src/report/report.css b/internal/vibe-tests/app/src/report/report.css
index fb49bc09f2..e18dd1015b 100644
--- a/internal/vibe-tests/app/src/report/report.css
+++ b/internal/vibe-tests/app/src/report/report.css
@@ -50,11 +50,11 @@
}
.report-color-positive {
- color: var(--color-positive);
+ color: var(--color-success);
}
.report-color-negative {
- color: var(--color-negative);
+ color: var(--color-error);
}
.report-color-neutral {
diff --git a/internal/vibe-tests/prompts/evaluator.md b/internal/vibe-tests/prompts/evaluator.md
index d87024cdbf..a8a482943f 100644
--- a/internal/vibe-tests/prompts/evaluator.md
+++ b/internal/vibe-tests/prompts/evaluator.md
@@ -79,7 +79,7 @@ XDS uses specific CSS variable naming. **Any variable not matching these pattern
| Colors | `--color-*` | `--color-surface`, `--color-text-primary`, `--color-accent` |
| Spacing | `--spacing-*` | `--spacing-0` through `--spacing-7` |
| Radius | `--radius-*` | `--radius-0`, `--radius-1`, `--radius-2`, `--radius-3`, `--radius-4`, `--radius-rounded` |
-| Shadow | `--shadow-*`, `--insetshadow-border-*` | `--shadow-base`, `--shadow-dialog`, `--insetshadow-border-hover` |
+| Shadow | `--shadow-*`, `--inset-shadow-border-*` | `--shadow-base`, `--shadow-dialog`, `--inset-shadow-border-hover` |
| Transitions | `--transition-*` | `--transition-fast`, `--transition-normal` |
| Font families | `--font-body`, `--font-code`, `--font-heading` | (only these three) |
| Text sizes | `--text-*` | `--text-base`, `--text-sm`, `--text-lg`, `--text-xl` |
@@ -91,10 +91,10 @@ XDS uses specific CSS variable naming. **Any variable not matching these pattern
- `--xds-*` prefix (INVALID - XDS doesn't use this prefix)
- `--xds-color-*`, `--xds-space-*`, `--xds-font-*` (INVALID)
- `--space-*` instead of `--spacing-*`
-- `--border-*` (doesn't exist - use `--color-divider` or component props)
+- `--border-*` (doesn't exist - use `--color-border` or component props)
- `--font-family-*` (doesn't exist - use `--font-body`, `--font-code`, `--font-heading`)
- `--font-size-*` (doesn't exist - use `--text-*`)
-- `--elevation-*` (doesn't exist - use `--shadow-*` and `--insetshadow-border-*`)
+- `--elevation-*` (doesn't exist - use `--shadow-*` and `--inset-shadow-border-*`)
When you detect a hallucinated CSS variable, create an escape hatch entry:
diff --git a/internal/vibe-tests/prompts/radius-evaluator.md b/internal/vibe-tests/prompts/radius-evaluator.md
index f72971c5f6..3278a51444 100644
--- a/internal/vibe-tests/prompts/radius-evaluator.md
+++ b/internal/vibe-tests/prompts/radius-evaluator.md
@@ -15,13 +15,13 @@ You will receive:
### Semantic (current)
-| Token | Value | Usage |
-| ------------------ | ------ | --------------- |
-| --radius-rounded | 9999px | Pills, avatars |
-| --radius-container | 12px | Cards, modals |
-| --radius-element | 8px | Buttons, inputs |
-| --radius-content | 4px | Small elements |
-| --radius-inner | 0px | No radius |
+| Token | Value | Usage |
+| ---------------- | ------ | --------------- |
+| --radius-rounded | 9999px | Pills, avatars |
+| --radius-3 | 12px | Cards, modals |
+| --radius-2 | 8px | Buttons, inputs |
+| --radius-1 | 4px | Small elements |
+| --radius-0 | 0px | No radius |
### Numeric (proposed)
@@ -51,14 +51,14 @@ Did the LLM pick the **right radius level** for each element?
Did the LLM invent tokens that don't exist in the given scheme?
- In semantic mode: using --radius-1, --radius-2, etc. is a hallucination
-- In numeric mode: using --radius-container, --radius-element, etc. is a hallucination
+- In numeric mode: using --radius-3, --radius-2, etc. is a hallucination
- In either mode: using --xds-radius-_, --border-radius-_, etc. is a hallucination
### 3. Hardcoded Values
Did the LLM use raw pixel values instead of tokens?
-- `borderRadius: '12px'` instead of `var(--radius-container)` or `var(--radius-3)`
+- `borderRadius: '12px'` instead of `var(--radius-3)` or `var(--radius-3)`
- This is an anti-pattern (hardcoded_radius)
### 4. Radius Hierarchy
@@ -83,7 +83,7 @@ Return JSON:
"success": true/false,
"componentsUsed": ["XDSCard", ...],
"componentsExpected": ["XDSCard", ...],
- "radiusTokensUsed": ["--radius-container", ...],
+ "radiusTokensUsed": ["--radius-3", ...],
"radiusSelectionCorrect": true/false,
"radiusSelectionDetail": "Correctly used container radius for card, element radius for button",
"escapeHatches": [...],
diff --git a/packages/cli/docs/theme.doc.mjs b/packages/cli/docs/theme.doc.mjs
index 0a04170f30..3051b279d9 100644
--- a/packages/cli/docs/theme.doc.mjs
+++ b/packages/cli/docs/theme.doc.mjs
@@ -242,7 +242,7 @@ const myTheme = defineTheme({
code: `const cardOverrides = stylex.create({
container: {
borderRadius: '20px',
- background: 'linear-gradient(135deg, var(--color-accent), var(--color-positive))',
+ background: 'linear-gradient(135deg, var(--color-accent), var(--color-success))',
padding: '2px',
},
content: {
diff --git a/packages/cli/docs/theme.md b/packages/cli/docs/theme.md
index 8ce8c11211..c76717b374 100644
--- a/packages/cli/docs/theme.md
+++ b/packages/cli/docs/theme.md
@@ -133,10 +133,10 @@ const myTheme = defineTheme({
name: 'my-theme',
// Type scale — generates heading and text tokens from base size + ratio
- typeScale: { base: 14, ratio: 1.2 },
+ typeScale: {base: 14, ratio: 1.2},
// Radius scale — generates radius tokens from base unit + multiplier
- radiusScale: { base: 4, multiplier: 1 },
+ radiusScale: {base: 4, multiplier: 1},
// Explicit token overrides (highest precedence — overrides scale values)
tokens: {
@@ -146,7 +146,7 @@ const myTheme = defineTheme({
// Component-level style overrides
components: {
button: {
- 'variant:primary': { color: 'white' },
+ 'variant:primary': {color: 'white'},
},
},
});
@@ -154,10 +154,10 @@ const myTheme = defineTheme({
**Scale configs:**
-| Config | What it generates | Parameters |
-| --- | --- | --- |
-| `typeScale` | `--heading-*-size/weight/leading`, `--text-*-size/weight/leading` | `base` (px), `ratio`, `weights?` |
-| `radiusScale` | `--radius-0` through `--radius-4`, `--radius-rounded` | `base` (px), `multiplier` (0–2) |
+| Config | What it generates | Parameters |
+| ------------- | ----------------------------------------------------------------- | -------------------------------- |
+| `typeScale` | `--heading-*-size/weight/leading`, `--text-*-size/weight/leading` | `base` (px), `ratio`, `weights?` |
+| `radiusScale` | `--radius-0` through `--radius-4`, `--radius-rounded` | `base` (px), `multiplier` (0–2) |
Explicit `tokens` overrides always take precedence over scale-generated values.
@@ -260,7 +260,7 @@ const cardOverrides = stylex.create({
container: {
borderRadius: '20px',
background:
- 'linear-gradient(135deg, var(--color-accent), var(--color-positive))',
+ 'linear-gradient(135deg, var(--color-accent), var(--color-success))',
padding: '2px', // gradient border width
},
content: {
diff --git a/packages/cli/docs/tokens.doc.mjs b/packages/cli/docs/tokens.doc.mjs
index 9862b0dca6..9fefea4e4b 100644
--- a/packages/cli/docs/tokens.doc.mjs
+++ b/packages/cli/docs/tokens.doc.mjs
@@ -67,8 +67,8 @@ export const docs = {
['--color-accent', 'Primary action color'],
['--color-surface', 'Background surface'],
['--color-wash', 'Secondary background'],
- ['--color-positive', 'Success states'],
- ['--color-negative', 'Error states'],
+ ['--color-success', 'Success states'],
+ ['--color-error', 'Error states'],
['--color-warning', 'Warning states'],
],
},
@@ -148,11 +148,11 @@ const sharpTheme = defineTheme({
['--shadow-menu', 'Floating elements (menus, popovers)'],
['--shadow-hover', 'Hover lift, toasts'],
['--shadow-dialog', 'Dialogs, modals'],
- ['--insetshadow-border-hover', 'Input hover ring'],
- ['--insetshadow-border-accent', 'Input focused/active ring'],
- ['--insetshadow-border-positive', 'Input success ring'],
- ['--insetshadow-border-warning', 'Input warning ring'],
- ['--insetshadow-border-negative', 'Input error ring'],
+ ['--inset-shadow-border-hover', 'Input hover ring'],
+ ['--inset-shadow-border-accent', 'Input focused/active ring'],
+ ['--inset-shadow-border-positive', 'Input success ring'],
+ ['--inset-shadow-border-warning', 'Input warning ring'],
+ ['--inset-shadow-border-negative', 'Input error ring'],
],
},
],
diff --git a/packages/cli/docs/tokens.md b/packages/cli/docs/tokens.md
index 91cae73f4a..7c499efe37 100644
--- a/packages/cli/docs/tokens.md
+++ b/packages/cli/docs/tokens.md
@@ -37,14 +37,14 @@ Control heights for consistent sizing across buttons, inputs, and selectors.
### Semantic Colors
-| Token | Usage |
-| ---------------- | -------------------- |
-| --color-accent | Primary action color |
-| --color-surface | Background surface |
-| --color-wash | Secondary background |
-| --color-positive | Success states |
-| --color-negative | Error states |
-| --color-warning | Warning states |
+| Token | Usage |
+| --------------- | -------------------- |
+| --color-accent | Primary action color |
+| --color-surface | Background surface |
+| --color-wash | Secondary background |
+| --color-success | Success states |
+| --color-error | Error states |
+| --color-warning | Warning states |
### Text Colors
@@ -107,17 +107,17 @@ const sharpTheme = defineTheme({
## Shadow Tokens
-| Token | Usage |
-| ----------------------------- | ------------------------- |
-| --shadow-base | Subtle lift (cards) |
-| --shadow-menu | Floating elements (menus) |
-| --shadow-hover | Hover lift, toasts |
-| --shadow-dialog | Dialogs, modals |
-| --insetshadow-border-hover | Input hover ring |
-| --insetshadow-border-accent | Input focused/active ring |
-| --insetshadow-border-positive | Input success ring |
-| --insetshadow-border-warning | Input warning ring |
-| --insetshadow-border-negative | Input error ring |
+| Token | Usage |
+| ------------------------------ | ------------------------- |
+| --shadow-base | Subtle lift (cards) |
+| --shadow-menu | Floating elements (menus) |
+| --shadow-hover | Hover lift, toasts |
+| --shadow-dialog | Dialogs, modals |
+| --inset-shadow-border-hover | Input hover ring |
+| --inset-shadow-border-accent | Input focused/active ring |
+| --inset-shadow-border-positive | Input success ring |
+| --inset-shadow-border-warning | Input warning ring |
+| --inset-shadow-border-negative | Input error ring |
## Typography Tokens
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-radius-tokens.test.mjs b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-radius-tokens.test.mjs
index 8a345ba8cf..6d9495e0f8 100644
--- a/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-radius-tokens.test.mjs
+++ b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-radius-tokens.test.mjs
@@ -67,7 +67,7 @@ describe('migrate-radius-tokens', () => {
expect(output).toContain('--radius-rounded');
});
- it('does not modify --radius-0 through --radius-4', async () => {
+ it('does not modify already-numeric --radius-0 through --radius-4', async () => {
const input = `const x = '--radius-3';`;
const output = await applyTransform(input);
expect(output).toContain('--radius-3');
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-shadow-tokens.test.mjs b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-shadow-tokens.test.mjs
index f3b2adf0b9..2a2b8e75d0 100644
--- a/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-shadow-tokens.test.mjs
+++ b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-shadow-tokens.test.mjs
@@ -38,17 +38,17 @@ describe('migrate-shadow-tokens', () => {
});
// Inset shadows
- it('--elevation-input-hover → --insetshadow-border-hover', async () => {
- expect(await applyTransform(`const x = '--elevation-input-hover';`)).toContain('--insetshadow-border-hover');
+ it('--elevation-input-hover → --inset-shadow-border-hover', async () => {
+ expect(await applyTransform(`const x = '--elevation-input-hover';`)).toContain('--inset-shadow-border-hover');
});
- it('--elevation-input-hover-success → --insetshadow-border-positive', async () => {
- expect(await applyTransform(`const x = '--elevation-input-hover-success';`)).toContain('--insetshadow-border-positive');
+ it('--elevation-input-hover-success → --inset-shadow-border-positive', async () => {
+ expect(await applyTransform(`const x = '--elevation-input-hover-success';`)).toContain('--inset-shadow-border-positive');
});
- it('--elevation-input-hover-warning → --insetshadow-border-warning', async () => {
- expect(await applyTransform(`const x = '--elevation-input-hover-warning';`)).toContain('--insetshadow-border-warning');
+ it('--elevation-input-hover-warning → --inset-shadow-border-warning', async () => {
+ expect(await applyTransform(`const x = '--elevation-input-hover-warning';`)).toContain('--inset-shadow-border-warning');
});
- it('--elevation-input-hover-error → --insetshadow-border-negative', async () => {
- expect(await applyTransform(`const x = '--elevation-input-hover-error';`)).toContain('--insetshadow-border-negative');
+ it('--elevation-input-hover-error → --inset-shadow-border-negative', async () => {
+ expect(await applyTransform(`const x = '--elevation-input-hover-error';`)).toContain('--inset-shadow-border-negative');
});
// JS identifiers
@@ -78,7 +78,7 @@ describe('migrate-shadow-tokens', () => {
it('handles defineTheme', async () => {
const out = await applyTransform(`const t = defineTheme({ tokens: { '--elevation-base': 'x', '--elevation-input-hover': 'y' } })`);
expect(out).toContain('--shadow-base');
- expect(out).toContain('--insetshadow-border-hover');
+ expect(out).toContain('--inset-shadow-border-hover');
});
// Safety
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-token-names.test.mjs b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-token-names.test.mjs
new file mode 100644
index 0000000000..223fd9cb00
--- /dev/null
+++ b/packages/cli/src/codemods/transforms/v0.0.5/__tests__/migrate-token-names.test.mjs
@@ -0,0 +1,265 @@
+import {describe, it, expect} from 'vitest';
+
+async function applyTransform(source) {
+ const {default: transform} = await import('../migrate-token-names.mjs');
+ const jscodeshift = (await import('jscodeshift')).default;
+ const api = {jscodeshift, stats: () => {}, report: () => {}};
+ const file = {source, path: 'test.tsx'};
+ const result = transform(file, api);
+ return result ?? source;
+}
+
+describe('migrate-token-names', () => {
+ // === Semantic clarity renames ===
+
+ it('renames --color-accent-deemphasized to --color-accent-muted', async () => {
+ const input = `const x = colorVars['--color-accent-deemphasized'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-accent-muted');
+ expect(output).not.toContain('--color-accent-deemphasized');
+ });
+
+ it('does NOT rename --color-accent (kept as-is)', async () => {
+ const input = `const x = colorVars['--color-accent'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-accent');
+ });
+
+ it('renames --color-positive to --color-success', async () => {
+ const input = `const x = colorVars['--color-positive'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-success');
+ expect(output).not.toContain('--color-positive');
+ });
+
+ it('renames --color-negative to --color-error', async () => {
+ const input = `const x = colorVars['--color-negative'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-error');
+ expect(output).not.toContain('--color-negative');
+ });
+
+ it('renames --color-educational to --color-info', async () => {
+ const input = `const x = colorVars['--color-educational'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-info');
+ expect(output).not.toContain('--color-educational');
+ });
+
+ it('renames *-deemphasized to *-muted for all status tokens', async () => {
+ const input = `const x = {
+ a: colorVars['--color-positive-deemphasized'],
+ b: colorVars['--color-negative-deemphasized'],
+ c: colorVars['--color-warning-deemphasized'],
+ d: colorVars['--color-educational-deemphasized'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-success-muted');
+ expect(output).toContain('--color-error-muted');
+ expect(output).toContain('--color-warning-muted');
+ expect(output).toContain('--color-info-muted');
+ expect(output).not.toMatch(/deemphasized/);
+ });
+
+ // === Noun-first grammar renames ===
+
+ it('renames overlay tokens to noun-first', async () => {
+ const input = `const x = {
+ a: colorVars['--color-hover-overlay'],
+ b: colorVars['--color-pressed-overlay'],
+ c: colorVars['--color-disabled-overlay'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-overlay-hover');
+ expect(output).toContain('--color-overlay-pressed');
+ expect(output).toContain('--color-overlay-disabled');
+ });
+
+ it('renames focus-outline tokens to ring-focus', async () => {
+ const input = `const x = {
+ a: colorVars['--color-focus-outline'],
+ b: colorVars['--color-focus-outline-error'],
+ c: colorVars['--color-focus-outline-success'],
+ d: colorVars['--color-focus-outline-warning'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-ring-focus');
+ expect(output).toContain('--color-ring-focus-error');
+ expect(output).toContain('--color-ring-focus-success');
+ expect(output).toContain('--color-ring-focus-warning');
+ expect(output).not.toMatch(/focus-outline/);
+ });
+
+ // === Border/divider renames ===
+
+ it('renames divider tokens to border', async () => {
+ const input = `const x = {
+ a: colorVars['--color-divider'],
+ b: colorVars['--color-divider-high-contrast'],
+ c: colorVars['--color-divider-emphasized'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-border');
+ expect(output).toContain('--color-border-strong');
+ expect(output).toContain('--color-border-emphasized');
+ expect(output).not.toMatch(/color-divider/);
+ });
+
+ // === Effects renames ===
+
+ it('renames glimmer to skeleton', async () => {
+ const input = `const x = colorVars['--color-glimmer'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-skeleton');
+ expect(output).not.toMatch(/glimmer/);
+ });
+
+ it('renames --color-shadow-elevation to --color-shadow', async () => {
+ const input = `const x = colorVars['--color-shadow-elevation'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-shadow');
+ expect(output).not.toContain('--color-shadow-elevation');
+ });
+
+ // === Media renames ===
+
+ it('renames on-media to on-dark-media', async () => {
+ const input = `const x = {
+ a: colorVars['--color-text-on-media'],
+ b: colorVars['--color-icon-on-media'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-text-on-dark-media');
+ expect(output).toContain('--color-icon-on-dark-media');
+ });
+
+ // === Token removals (replaced by existing) ===
+
+ it('replaces --color-accent-text with --color-text-link', async () => {
+ const input = `const x = colorVars['--color-accent-text'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-text-link');
+ expect(output).not.toContain('--color-accent-text');
+ });
+
+ it('replaces --color-text-placeholder with --color-text-secondary', async () => {
+ const input = `const x = colorVars['--color-text-placeholder'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-text-secondary');
+ expect(output).not.toContain('--color-text-placeholder');
+ });
+
+ it('replaces --color-icon-tertiary with --color-icon-secondary', async () => {
+ const input = `const x = colorVars['--color-icon-tertiary'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-icon-secondary');
+ expect(output).not.toContain('--color-icon-tertiary');
+ });
+
+ // === Edge cases ===
+
+ it('handles var() references in string literals', async () => {
+ const input = `const x = 'var(--color-divider)';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('var(--color-border)');
+ expect(output).not.toContain('--color-divider');
+ });
+
+ it('handles template literals', async () => {
+ const input = 'const css = `color: var(--color-educational)`;';
+ const output = await applyTransform(input);
+ expect(output).toContain('--color-info');
+ expect(output).not.toContain('--color-educational');
+ });
+
+ it('handles defineTheme token objects', async () => {
+ const input = `defineTheme({
+ tokens: {
+ '--color-accent': ['#0064E0', '#2694FE'],
+ '--color-positive': ['#0D8626', '#0D8626'],
+ '--color-divider': ['#05365919', '#F2F4F619'],
+ }
+ })`;
+ const output = await applyTransform(input);
+ // accent stays as accent
+ expect(output).toContain('--color-accent');
+ // positive → success
+ expect(output).toContain('--color-success');
+ // divider → border
+ expect(output).toContain('--color-border');
+ expect(output).not.toContain('--color-positive');
+ expect(output).not.toContain('--color-divider');
+ });
+
+ it('does not modify tokens that are already renamed', async () => {
+ const input = `const x = {
+ a: colorVars['--color-accent'],
+ b: colorVars['--color-success'],
+ c: colorVars['--color-error'],
+ d: colorVars['--color-border'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toBe(input);
+ });
+
+ it('does not modify unrelated tokens', async () => {
+ const input = `const x = {
+ a: colorVars['--color-text-primary'],
+ b: colorVars['--color-surface'],
+ c: colorVars['--color-warning'],
+ d: colorVars['--color-blue-background'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toBe(input);
+ });
+
+ it('returns undefined when no changes needed', async () => {
+ const {default: transform} = await import('../migrate-token-names.mjs');
+ const jscodeshift = (await import('jscodeshift')).default;
+ const api = {jscodeshift, stats: () => {}, report: () => {}};
+ const source = `const x = '--color-accent';`;
+ const result = transform({source, path: 'test.tsx'}, api);
+ expect(result).toBeUndefined();
+ });
+
+ it('does not partially match (--color-accent stays, --color-accent-text renames)', async () => {
+ const input = `const x = {
+ a: colorVars['--color-accent-text'],
+ b: colorVars['--color-accent'],
+ };`;
+ const output = await applyTransform(input);
+ // accent-text → text-link
+ expect(output).toContain('--color-text-link');
+ // accent stays as accent
+ expect(output).toContain('--color-accent');
+ expect(output).not.toContain('--color-accent-text');
+ });
+
+ // === Inset shadow rename (Tailwind alignment) ===
+
+ it('renames --insetshadow-border-* to --inset-shadow-border-*', async () => {
+ const input = `const x = {
+ a: shadowVars['--insetshadow-border-hover'],
+ b: shadowVars['--insetshadow-border-accent'],
+ c: shadowVars['--insetshadow-border-positive'],
+ d: shadowVars['--insetshadow-border-warning'],
+ e: shadowVars['--insetshadow-border-negative'],
+ };`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--inset-shadow-border-hover');
+ expect(output).toContain('--inset-shadow-border-accent');
+ expect(output).toContain('--inset-shadow-border-positive');
+ expect(output).toContain('--inset-shadow-border-warning');
+ expect(output).toContain('--inset-shadow-border-negative');
+ expect(output).not.toMatch(/insetshadow/);
+ });
+
+ // === Easing rename (Tailwind alignment) ===
+
+ it('renames --easing-standard to --ease-standard', async () => {
+ const input = `const x = easeVars['--easing-standard'];`;
+ const output = await applyTransform(input);
+ expect(output).toContain('--ease-standard');
+ expect(output).not.toContain('--easing-standard');
+ });
+});
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/index.mjs b/packages/cli/src/codemods/transforms/v0.0.5/index.mjs
index 56365fa4a0..0fc04ac45e 100644
--- a/packages/cli/src/codemods/transforms/v0.0.5/index.mjs
+++ b/packages/cli/src/codemods/transforms/v0.0.5/index.mjs
@@ -18,6 +18,10 @@ import migrateShadowTokens, {
meta as shadowTokensMeta,
} from './migrate-shadow-tokens.mjs';
+import migrateTokenNames, {
+ meta as tokenNamesMeta,
+} from './migrate-token-names.mjs';
+
export default [
{
name: 'migrate-collapse-to-collapsible',
@@ -39,4 +43,9 @@ export default [
transform: migrateShadowTokens,
meta: shadowTokensMeta,
},
+ {
+ name: 'migrate-token-names',
+ transform: migrateTokenNames,
+ meta: tokenNamesMeta,
+ },
];
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/migrate-shadow-tokens.mjs b/packages/cli/src/codemods/transforms/v0.0.5/migrate-shadow-tokens.mjs
index 7c7a050193..1b536fcbd1 100644
--- a/packages/cli/src/codemods/transforms/v0.0.5/migrate-shadow-tokens.mjs
+++ b/packages/cli/src/codemods/transforms/v0.0.5/migrate-shadow-tokens.mjs
@@ -14,10 +14,10 @@
* --shadow-4 → --shadow-dialog
*
* Inset shadows (semantic states):
- * --elevation-input-hover → --insetshadow-border-hover
- * --elevation-input-hover-success → --insetshadow-border-positive
- * --elevation-input-hover-warning → --insetshadow-border-warning
- * --elevation-input-hover-error → --insetshadow-border-negative
+ * --elevation-input-hover → --inset-shadow-border-hover
+ * --elevation-input-hover-success → --inset-shadow-border-positive
+ * --elevation-input-hover-warning → --inset-shadow-border-warning
+ * --elevation-input-hover-error → --inset-shadow-border-negative
*
* JS identifier renames:
* elevationDefaults → shadowDefaults
@@ -29,14 +29,14 @@
export const meta = {
title: 'Migrate elevation tokens to shadow semantic naming',
description:
- 'Renames --elevation-* to --shadow-base/menu/hover/dialog and --insetshadow-border-*. Also migrates --shadow-1/2/3/4 from the brief numeric naming period.',
+ 'Renames --elevation-* to --shadow-base/menu/hover/dialog and --inset-shadow-border-*. Also migrates --shadow-1/2/3/4 from the brief numeric naming period.',
};
const TOKEN_MAP = {
- '--elevation-input-hover-success': '--insetshadow-border-positive',
- '--elevation-input-hover-warning': '--insetshadow-border-warning',
- '--elevation-input-hover-error': '--insetshadow-border-negative',
- '--elevation-input-hover': '--insetshadow-border-hover',
+ '--elevation-input-hover-success': '--inset-shadow-border-positive',
+ '--elevation-input-hover-warning': '--inset-shadow-border-warning',
+ '--elevation-input-hover-error': '--inset-shadow-border-negative',
+ '--elevation-input-hover': '--inset-shadow-border-hover',
'--elevation-base': '--shadow-base',
'--elevation-menu': '--shadow-menu',
'--elevation-hover': '--shadow-hover',
diff --git a/packages/cli/src/codemods/transforms/v0.0.5/migrate-token-names.mjs b/packages/cli/src/codemods/transforms/v0.0.5/migrate-token-names.mjs
new file mode 100644
index 0000000000..4892bd588f
--- /dev/null
+++ b/packages/cli/src/codemods/transforms/v0.0.5/migrate-token-names.mjs
@@ -0,0 +1,156 @@
+/**
+ * @file Codemod: Migrate renamed design tokens from v0.0.5 naming audit
+ *
+ * Renames all tokens updated in the naming audit:
+ *
+ * Color — semantic clarity:
+ * - '--color-accent-deemphasized' → '--color-accent-muted'
+ * - '--color-accent-text' → '--color-text-link'
+ * - '--color-deemphasized' → '--color-muted'
+ * - '--color-positive' → '--color-success'
+ * - '--color-positive-deemphasized' → '--color-success-muted'
+ * - '--color-negative' → '--color-error'
+ * - '--color-negative-deemphasized' → '--color-error-muted'
+ * - '--color-educational' → '--color-info'
+ * - '--color-educational-deemphasized' → '--color-info-muted'
+ * - '--color-warning-deemphasized' → '--color-warning-muted'
+ *
+ * Color — noun-first grammar:
+ * - '--color-hover-overlay' → '--color-overlay-hover'
+ * - '--color-pressed-overlay' → '--color-overlay-pressed'
+ * - '--color-disabled-overlay' → '--color-overlay-disabled'
+ * - '--color-focus-outline' → '--color-ring-focus'
+ * - '--color-focus-outline-error' → '--color-ring-focus-error'
+ * - '--color-focus-outline-success' → '--color-ring-focus-success'
+ * - '--color-focus-outline-warning' → '--color-ring-focus-warning'
+ *
+ * Color — border/divider:
+ * - '--color-divider' → '--color-border'
+ * - '--color-divider-high-contrast' → '--color-border-strong'
+ * - '--color-divider-emphasized' → '--color-border-emphasized'
+ *
+ * Color — effects:
+ * - '--color-glimmer' → '--color-skeleton'
+ * - '--color-shadow-elevation' → '--color-shadow'
+ *
+ * Color — media:
+ * - '--color-text-on-media' → '--color-text-on-dark-media'
+ * - '--color-icon-on-media' → '--color-icon-on-dark-media'
+ *
+ * Color — removals (replaced by existing tokens):
+ * - '--color-text-placeholder' → '--color-text-secondary'
+ * - '--color-icon-tertiary' → '--color-icon-secondary'
+ *
+ * Inset shadow (Tailwind alignment):
+ * - '--insetshadow-border-*' → '--inset-shadow-border-*'
+ *
+ * Easing (Tailwind alignment):
+ * - '--easing-standard' → '--ease-standard'
+ *
+ * Note: --color-accent is NOT renamed (kept as-is to avoid ambiguity
+ * with --color-text-primary and --color-icon-primary).
+ *
+ * Handles:
+ * - String literals (e.g. '--color-accent' or 'var(--color-accent)')
+ * - Template literal quasis containing old tokens
+ * - Property access (e.g. colorVars['--color-accent'])
+ */
+
+export const meta = {
+ title: 'Migrate renamed design tokens',
+ description:
+ 'Renames color tokens from the v0.0.5 naming audit (positive→success, negative→error, divider→border, etc.).',
+};
+
+// Ordered longest-first to prevent partial matches
+// (e.g. --color-educational-deemphasized must match before --color-educational)
+const TOKEN_MAP = {
+ '--color-educational-deemphasized': '--color-info-muted',
+ '--color-divider-high-contrast': '--color-border-strong',
+ '--color-focus-outline-success': '--color-ring-focus-success',
+ '--color-focus-outline-warning': '--color-ring-focus-warning',
+ '--color-negative-deemphasized': '--color-error-muted',
+ '--color-positive-deemphasized': '--color-success-muted',
+ '--color-warning-deemphasized': '--color-warning-muted',
+ '--color-accent-deemphasized': '--color-accent-muted',
+ '--color-focus-outline-error': '--color-ring-focus-error',
+ '--color-divider-emphasized': '--color-border-emphasized',
+ '--color-disabled-overlay': '--color-overlay-disabled',
+ '--color-shadow-elevation': '--color-shadow',
+ '--color-text-placeholder': '--color-text-secondary',
+ '--color-pressed-overlay': '--color-overlay-pressed',
+ '--color-focus-outline': '--color-ring-focus',
+ '--color-hover-overlay': '--color-overlay-hover',
+ '--color-icon-on-media': '--color-icon-on-dark-media',
+ '--color-icon-tertiary': '--color-icon-secondary',
+ '--color-text-on-media': '--color-text-on-dark-media',
+ '--color-deemphasized': '--color-muted',
+ '--color-accent-text': '--color-text-link',
+ '--color-educational': '--color-info',
+ '--color-negative': '--color-error',
+ '--color-positive': '--color-success',
+ '--color-divider': '--color-border',
+ '--color-glimmer': '--color-skeleton',
+ // Inset shadow: insetshadow → inset-shadow (Tailwind alignment)
+ '--insetshadow-border-positive': '--inset-shadow-border-positive',
+ '--insetshadow-border-negative': '--inset-shadow-border-negative',
+ '--insetshadow-border-warning': '--inset-shadow-border-warning',
+ '--insetshadow-border-accent': '--inset-shadow-border-accent',
+ '--insetshadow-border-hover': '--inset-shadow-border-hover',
+ // Easing: easing → ease (Tailwind alignment)
+ '--easing-standard': '--ease-standard',
+};
+
+// Build a regex that matches any old token name, longest first.
+// Uses negative lookahead for word-like chars to avoid partial matches
+// (e.g. --color-accent must not match inside --color-accent-deemphasized).
+const OLD_TOKENS_PATTERN = new RegExp(
+ Object.keys(TOKEN_MAP)
+ .sort((a, b) => b.length - a.length)
+ .map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+ .join('|') + '(?![a-zA-Z0-9_-])',
+ 'g',
+);
+
+function replaceTokens(str) {
+ return str.replace(OLD_TOKENS_PATTERN, (match) => TOKEN_MAP[match] || match);
+}
+
+export default function transformer(file, api) {
+ const j = api.jscodeshift;
+ const root = j(file.source);
+ let hasChanges = false;
+
+ // Replace in string literals (StringLiteral or Literal with string value)
+ const replaceInStringNode = (path) => {
+ if (typeof path.node.value !== 'string') return;
+ const original = path.node.value;
+ const replaced = replaceTokens(original);
+ if (replaced !== original) {
+ path.node.value = replaced;
+ hasChanges = true;
+ }
+ };
+
+ root.find(j.StringLiteral).forEach(replaceInStringNode);
+ root.find(j.Literal).forEach((path) => {
+ if (typeof path.node.value === 'string') {
+ replaceInStringNode(path);
+ }
+ });
+
+ // Replace in template literal quasis
+ root.find(j.TemplateLiteral).forEach((path) => {
+ for (const quasi of path.node.quasis) {
+ const original = quasi.value.raw;
+ const replaced = replaceTokens(original);
+ if (replaced !== original) {
+ quasi.value.raw = replaced;
+ quasi.value.cooked = replaceTokens(quasi.value.cooked);
+ hasChanges = true;
+ }
+ }
+ });
+
+ return hasChanges ? root.toSource() : undefined;
+}
diff --git a/packages/cli/src/commands/build-theme.mjs b/packages/cli/src/commands/build-theme.mjs
index b570041cce..b70615fc00 100644
--- a/packages/cli/src/commands/build-theme.mjs
+++ b/packages/cli/src/commands/build-theme.mjs
@@ -248,7 +248,7 @@ function generateProseCSS(themeDef) {
parts.push(` code, pre {\n font-family: var(--font-code);\n font-size: var(--text-base);\n line-height: var(--leading-base);\n }`);
- parts.push(` hr {\n border: none;\n border-top: 1px solid var(--color-divider);\n margin: 0;\n }`);
+ parts.push(` hr {\n border: none;\n border-top: 1px solid var(--color-border);\n margin: 0;\n }`);
const inner = parts.join('\n\n');
return `@scope (${scopeSelector}) to ([data-xds-theme]) {\n${inner}\n}`;
diff --git a/packages/cli/src/commands/theme.mjs b/packages/cli/src/commands/theme.mjs
index 73c8a9535e..0a9c8b5690 100644
--- a/packages/cli/src/commands/theme.mjs
+++ b/packages/cli/src/commands/theme.mjs
@@ -102,54 +102,54 @@ function deriveColorPalette({accent, positive, negative, warning, mode}) {
return {
// Core semantic
'--color-accent': ld(accentDark, accentLight),
- '--color-accent-deemphasized': ld(withAlpha(accent, 0.2), withAlpha(accent, 0.25)),
- '--color-accent-text': ld(accentTextLight, accentTextDark),
+ '--color-accent-muted': ld(withAlpha(accent, 0.2), withAlpha(accent, 0.25)),
+ '--color-secondary': ld('rgba(5, 54, 89, 0.1)', 'rgba(223, 226, 229, 0.2)'),
+ '--color-text-link': ld(accentTextLight, accentTextDark),
'--color-surface': ld('#FFFFFF', '#1F1F22'),
'--color-wash': ld('#F1F4F7', '#111112'),
'--color-overlay': ld('#01122866', '#11111299'),
- '--color-hover-overlay': ld('#0536590C', '#FFFFFF0C'),
- '--color-pressed-overlay': ld('#05365919', '#FFFFFF19'),
- '--color-focus-outline': ld(accentTextLight, accentTextDark),
- '--color-deemphasized': ld('#0536590C', '#1111127F'),
+ '--color-overlay-hover': ld('#0536590C', '#FFFFFF0C'),
+ '--color-overlay-pressed': ld('#05365919', '#FFFFFF19'),
+ '--color-ring-focus': ld(accentTextLight, accentTextDark),
+ '--color-muted': ld('#0536590C', '#1111127F'),
// Text
'--color-text-primary': ld('#0A1317', '#DFE2E5'),
'--color-text-secondary': ld('#4E606F', '#AAAFB5'),
'--color-text-disabled': ld('#A4B0BC', '#6F747C'),
'--color-text-link': ld(accentDark, accentLight),
- '--color-text-placeholder': ld('#4E606F', '#AAAFB5'),
- '--color-text-on-media': ld('#FFFFFF', '#FFFFFF'),
+ '--color-text-secondary': ld('#4E606F', '#AAAFB5'),
+ '--color-text-on-dark-media': ld('#FFFFFF', '#FFFFFF'),
// Icon
'--color-icon-primary': ld('#0A1317', '#DFE2E5'),
'--color-icon-secondary': ld('#4E606F', '#AAAFB5'),
- '--color-icon-tertiary': ld('#748695', '#8C939B'),
+ '--color-icon-secondary': ld('#748695', '#8C939B'),
'--color-icon-disabled': ld('#A4B0BC', '#6F747C'),
- '--color-icon-on-media': ld('#FFFFFF', '#FFFFFF'),
+ '--color-icon-on-dark-media': ld('#FFFFFF', '#FFFFFF'),
// Surface variants
'--color-card': ld('#FFFFFF', '#1F1F22'),
'--color-popover': ld('#FFFFFF', '#28292C'),
// Status
- '--color-positive': ld(positive, positive),
- '--color-positive-deemphasized': ld(withAlpha(positive, 0.2), withAlpha(positive, 0.25)),
- '--color-negative': ld(negative, mixColors(negative, '#FF6666', 0.3)),
- '--color-negative-deemphasized': ld(withAlpha(negative, 0.2), withAlpha(negative, 0.25)),
+ '--color-success': ld(positive, positive),
+ '--color-success-muted': ld(withAlpha(positive, 0.2), withAlpha(positive, 0.25)),
+ '--color-error': ld(negative, mixColors(negative, '#FF6666', 0.3)),
+ '--color-error-muted': ld(withAlpha(negative, 0.2), withAlpha(negative, 0.25)),
'--color-warning': ld(warning, mixColors(warning, '#FFCC00', 0.3)),
- '--color-warning-deemphasized': ld(withAlpha(warning, 0.2), withAlpha(warning, 0.25)),
- '--color-educational': ld('#5B08D8', '#6B1EFD'),
- '--color-educational-deemphasized': ld('#7952FF33', '#5B08D83F'),
+ '--color-warning-muted': ld(withAlpha(warning, 0.2), withAlpha(warning, 0.25)),
+ '--color-info': ld('#5B08D8', '#6B1EFD'),
+ '--color-info-muted': ld('#7952FF33', '#5B08D83F'),
// Divider
- '--color-divider': ld('#05365919', '#F2F4F619'),
- '--color-divider-high-contrast': ld('#647685', '#6F747C'),
- '--color-divider-emphasized': ld('#CCD3DB', '#494D53'),
+ '--color-border': ld('#05365919', '#F2F4F619'),
+ '--color-border-strong': ld('#647685', '#6F747C'),
+ '--color-border-emphasized': ld('#CCD3DB', '#494D53'),
// Effects
- '--color-glimmer': ld('#CCD3DB', '#5A5E66'),
- '--color-glimmer-high-contrast': ld('#A4B0BC', '#8C939B'),
- '--color-shadow-elevation': ld('rgba(5, 54, 89, 0.1)', 'rgba(0, 0, 0, 0.3)'),
+ '--color-skeleton': ld('#CCD3DB', '#5A5E66'),
+ '--color-shadow': ld('rgba(5, 54, 89, 0.1)', 'rgba(0, 0, 0, 0.3)'),
'--color-hover-tint': ld('black', 'white'),
// Literal color sets
diff --git a/packages/core/src/AppShell/XDSAppShell.tsx b/packages/core/src/AppShell/XDSAppShell.tsx
index c72f9331a7..6b5c57a293 100644
--- a/packages/core/src/AppShell/XDSAppShell.tsx
+++ b/packages/core/src/AppShell/XDSAppShell.tsx
@@ -301,7 +301,7 @@ const styles = stylex.create({
':focus': spacingVars['--spacing-2'],
},
backgroundColor: colorVars['--color-surface'],
- color: colorVars['--color-accent-text'],
+ color: colorVars['--color-text-link'],
zIndex: 9999,
textDecoration: 'none',
fontWeight: fontWeightVars['--font-weight-semibold'],
diff --git a/packages/core/src/Avatar/XDSAvatar.tsx b/packages/core/src/Avatar/XDSAvatar.tsx
index 2357e6c702..53f67a4985 100644
--- a/packages/core/src/Avatar/XDSAvatar.tsx
+++ b/packages/core/src/Avatar/XDSAvatar.tsx
@@ -128,7 +128,7 @@ const styles = stylex.create({
justifyContent: 'center',
width: '100%',
height: '100%',
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
color: colorVars['--color-text-secondary'],
fontFamily: typographyVars['--font-body'],
fontWeight: fontWeightVars['--font-weight-medium'],
diff --git a/packages/core/src/Avatar/XDSAvatarStatusDot.tsx b/packages/core/src/Avatar/XDSAvatarStatusDot.tsx
index 27d24a0751..058be2e017 100644
--- a/packages/core/src/Avatar/XDSAvatarStatusDot.tsx
+++ b/packages/core/src/Avatar/XDSAvatarStatusDot.tsx
@@ -93,13 +93,13 @@ const styles = stylex.create({
justifyContent: 'center',
},
positive: {
- backgroundColor: colorVars['--color-positive'],
+ backgroundColor: colorVars['--color-success'],
},
neutral: {
backgroundColor: colorVars['--color-text-secondary'],
},
negative: {
- backgroundColor: colorVars['--color-negative'],
+ backgroundColor: colorVars['--color-error'],
},
icon: {
display: 'flex',
diff --git a/packages/core/src/Badge/XDSBadge.tsx b/packages/core/src/Badge/XDSBadge.tsx
index f1c7e19eb4..ab9095829e 100644
--- a/packages/core/src/Badge/XDSBadge.tsx
+++ b/packages/core/src/Badge/XDSBadge.tsx
@@ -55,24 +55,24 @@ const styles = stylex.create({
*/
const variants = stylex.create({
neutral: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-secondary'],
color: colorVars['--color-text-primary'],
},
info: {
backgroundColor: colorVars['--color-accent'],
- color: colorVars['--color-text-on-media'],
+ color: colorVars['--color-text-on-dark-media'],
},
success: {
- backgroundColor: colorVars['--color-positive'],
- color: colorVars['--color-text-on-media'],
+ backgroundColor: colorVars['--color-success'],
+ color: colorVars['--color-text-on-dark-media'],
},
warning: {
backgroundColor: colorVars['--color-warning'],
color: colorVars['--color-text-primary'],
},
error: {
- backgroundColor: colorVars['--color-negative'],
- color: colorVars['--color-text-on-media'],
+ backgroundColor: colorVars['--color-error'],
+ color: colorVars['--color-text-on-dark-media'],
},
});
diff --git a/packages/core/src/Banner/Banner.doc.mjs b/packages/core/src/Banner/Banner.doc.mjs
index bfb784f1c9..fec7f3e32a 100644
--- a/packages/core/src/Banner/Banner.doc.mjs
+++ b/packages/core/src/Banner/Banner.doc.mjs
@@ -11,7 +11,7 @@ export const docs = {
'Self-managed dismiss state — banner hides itself on dismiss without requiring external state wiring',
'onDismiss callback fires alongside the internal state change for logging or backend sync',
'Default status icons from @heroicons/react/24/solid: InformationCircleIcon (info), ExclamationTriangleIcon (warning), XCircleIcon (error), CheckCircleIcon (success)',
- 'Status colors: info uses --color-accent-deemphasized, warning uses --color-warning-deemphasized, error uses --color-negative-deemphasized, success uses --color-positive-deemphasized',
+ 'Status colors: info uses --color-accent-muted, warning uses --color-warning-muted, error uses --color-error-muted, success uses --color-success-muted',
'Card variant (default): has border-radius with optional card content area below the colored header',
'Section variant: no border-radius, full-width for page-level banners',
],
@@ -137,7 +137,7 @@ export const docsZh = {
'自管理关闭状态——横幅在关闭时自动隐藏,无需外部状态管理',
'onDismiss 回调在内部状态变更的同时触发,用于日志记录或后端同步',
'默认状态图标来自 @heroicons/react/24/solid:InformationCircleIcon(info)、ExclamationTriangleIcon(warning)、XCircleIcon(error)、CheckCircleIcon(success)',
- '状态颜色:info 使用 --color-accent-deemphasized,warning 使用 --color-warning-deemphasized,error 使用 --color-negative-deemphasized,success 使用 --color-positive-deemphasized',
+ '状态颜色:info 使用 --color-accent-muted,warning 使用 --color-warning-muted,error 使用 --color-error-muted,success 使用 --color-success-muted',
'Card 变体(默认):带圆角,彩色头部下方可选卡片内容区',
'Section 变体:无圆角,全宽,适用于页面级横幅',
],
diff --git a/packages/core/src/Banner/XDSBanner.tsx b/packages/core/src/Banner/XDSBanner.tsx
index 02083c8ff8..b1d2b13909 100644
--- a/packages/core/src/Banner/XDSBanner.tsx
+++ b/packages/core/src/Banner/XDSBanner.tsx
@@ -260,9 +260,9 @@ const styles = stylex.create({
borderLeftStyle: 'solid',
borderRightStyle: 'solid',
borderBottomStyle: 'solid',
- borderLeftColor: colorVars['--color-divider'],
- borderRightColor: colorVars['--color-divider'],
- borderBottomColor: colorVars['--color-divider'],
+ borderLeftColor: colorVars['--color-border'],
+ borderRightColor: colorVars['--color-border'],
+ borderBottomColor: colorVars['--color-border'],
},
contentAreaCard: {
borderBottomLeftRadius: radiusVars['--radius-3'],
@@ -272,16 +272,16 @@ const styles = stylex.create({
const statusStyles = stylex.create({
info: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
warning: {
- backgroundColor: colorVars['--color-warning-deemphasized'],
+ backgroundColor: colorVars['--color-warning-muted'],
},
error: {
- backgroundColor: colorVars['--color-negative-deemphasized'],
+ backgroundColor: colorVars['--color-error-muted'],
},
success: {
- backgroundColor: colorVars['--color-positive-deemphasized'],
+ backgroundColor: colorVars['--color-success-muted'],
},
});
diff --git a/packages/core/src/Button/XDSButton.tsx b/packages/core/src/Button/XDSButton.tsx
index 28c28c4128..c68fb477b1 100644
--- a/packages/core/src/Button/XDSButton.tsx
+++ b/packages/core/src/Button/XDSButton.tsx
@@ -24,7 +24,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -60,7 +60,7 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-image, transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transform: {
default: 'scale(1)',
':active': 'scale(0.98)',
@@ -106,17 +106,17 @@ const sizeStyles = stylex.create({
const variants = stylex.create({
primary: {
backgroundColor: colorVars['--color-accent'],
- color: colorVars['--color-text-on-media'],
+ color: colorVars['--color-text-on-dark-media'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -124,18 +124,18 @@ const variants = stylex.create({
},
},
secondary: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-secondary'],
color: colorVars['--color-text-primary'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -148,13 +148,13 @@ const variants = stylex.create({
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -162,18 +162,18 @@ const variants = stylex.create({
},
},
destructive: {
- backgroundColor: colorVars['--color-negative'],
- color: colorVars['--color-text-on-media'],
+ backgroundColor: colorVars['--color-error'],
+ color: colorVars['--color-text-on-dark-media'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-negative']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-error']}`,
},
outlineOffset: {
default: '0',
diff --git a/packages/core/src/Calendar/styles.ts b/packages/core/src/Calendar/styles.ts
index f461183e4f..fce2c96a89 100644
--- a/packages/core/src/Calendar/styles.ts
+++ b/packages/core/src/Calendar/styles.ts
@@ -18,7 +18,7 @@ import {
sizeVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
} from '../theme/tokens.stylex';
@@ -193,7 +193,7 @@ export const dayCellStyles = stylex.create({
zIndex: 1,
transitionProperty: 'background-color, color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
// Expand hit target by 2px on each side to prevent gaps
'::before': {
content: '""',
@@ -224,12 +224,12 @@ export const dayCellStyles = stylex.create({
export const dayCellTheme = stylex.create({
// Range background color
rangeBg: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
// Preview background (muted overlay)
previewBg: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
// Day button - default state
@@ -239,12 +239,12 @@ export const dayCellTheme = stylex.create({
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -259,7 +259,7 @@ export const dayCellTheme = stylex.create({
// Today indicator
dayToday: {
- boxShadow: `inset 0 0 0 1px ${colorVars['--color-divider-emphasized']}`,
+ boxShadow: `inset 0 0 0 1px ${colorVars['--color-border-emphasized']}`,
},
// Today when inside a selected range
@@ -270,11 +270,11 @@ export const dayCellTheme = stylex.create({
// Selected state (single selection or range endpoints)
daySelected: {
backgroundColor: colorVars['--color-accent'],
- color: colorVars['--color-text-on-media'],
+ color: colorVars['--color-text-on-dark-media'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
},
},
diff --git a/packages/core/src/Card/XDSCard.tsx b/packages/core/src/Card/XDSCard.tsx
index f509ba2632..bd4d223f22 100644
--- a/packages/core/src/Card/XDSCard.tsx
+++ b/packages/core/src/Card/XDSCard.tsx
@@ -36,7 +36,7 @@ const styles = stylex.create({
overflow: 'clip',
borderWidth: 1,
borderStyle: 'solid',
- borderColor: colorVars['--color-divider-emphasized'],
+ borderColor: colorVars['--color-border-emphasized'],
},
// Inner wrapper: container padding and overflow handling
cardInner: {
diff --git a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
index f9b3a69f82..5b5b2626de 100644
--- a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
+++ b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
@@ -27,7 +27,7 @@ import {
radiusVars,
textSizeVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
} from '../theme/tokens.stylex';
import {XDSFieldLabel} from '../Field/XDSFieldLabel';
@@ -73,13 +73,13 @@ const styles = stylex.create({
borderRadius: radiusVars['--radius-1'],
transitionProperty: 'background-color, border-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
checkboxFocus: {
outline: {
default: 'none',
[stylex.when.ancestor(':focus-within')]:
- `2px solid ${colorVars['--color-focus-outline']}`,
+ `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: null,
@@ -89,9 +89,9 @@ const styles = stylex.create({
// State-dependent colors with ancestor hover behavior
checkboxUnchecked: {
borderColor: {
- default: colorVars['--color-divider-emphasized'],
+ default: colorVars['--color-border-emphasized'],
[stylex.when.ancestor(':hover')]: {
- '@media (hover: hover)': `color-mix(in srgb, ${colorVars['--color-divider-emphasized']}, ${colorVars['--color-hover-tint']} 20%)`,
+ '@media (hover: hover)': `color-mix(in srgb, ${colorVars['--color-border-emphasized']}, ${colorVars['--color-hover-tint']} 20%)`,
},
},
backgroundColor: {
@@ -117,21 +117,21 @@ const styles = stylex.create({
},
checkboxDisabled: {
opacity: 0.5,
- borderColor: colorVars['--color-divider'],
+ borderColor: colorVars['--color-border'],
},
checkboxDisabledUnchecked: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
},
checkmark: {
display: 'none',
- color: colorVars['--color-icon-on-media'],
+ color: colorVars['--color-icon-on-dark-media'],
},
checkmarkVisible: {
display: 'block',
},
indeterminateMark: {
display: 'none',
- backgroundColor: colorVars['--color-icon-on-media'],
+ backgroundColor: colorVars['--color-icon-on-dark-media'],
borderRadius: 1,
},
indeterminateMarkVisible: {
diff --git a/packages/core/src/Collapsible/XDSCollapsible.tsx b/packages/core/src/Collapsible/XDSCollapsible.tsx
index 15874cbdbb..633e9fa0fd 100644
--- a/packages/core/src/Collapsible/XDSCollapsible.tsx
+++ b/packages/core/src/Collapsible/XDSCollapsible.tsx
@@ -27,7 +27,7 @@ import {
spacingVars,
textSizeVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
import {useXDSCollapsible} from './useXDSCollapsible';
import {getIcon} from '../Icon/globalIconRegistry';
@@ -58,7 +58,7 @@ const styles = stylex.create({
flexShrink: 0,
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
color: colorVars['--color-icon-secondary'],
},
chevronOpen: {
diff --git a/packages/core/src/DateInput/XDSDateInput.tsx b/packages/core/src/DateInput/XDSDateInput.tsx
index 85c86fa9cb..b4c0dc0d12 100644
--- a/packages/core/src/DateInput/XDSDateInput.tsx
+++ b/packages/core/src/DateInput/XDSDateInput.tsx
@@ -66,7 +66,7 @@ const styles = stylex.create({
borderRadius: radiusVars['--radius-2'],
outline: {
default: 'none',
- ':focus-visible': `1px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `1px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: 1,
},
@@ -87,7 +87,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
},
inputDisabled: {
diff --git a/packages/core/src/Dialog/XDSDialog.tsx b/packages/core/src/Dialog/XDSDialog.tsx
index b33ec8a3e0..0ebe24050f 100644
--- a/packages/core/src/Dialog/XDSDialog.tsx
+++ b/packages/core/src/Dialog/XDSDialog.tsx
@@ -20,7 +20,7 @@ import {
colorVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
shadowVars,
} from '../theme/tokens.stylex';
import {xdsClassName, mergeProps} from '../utils';
@@ -81,10 +81,10 @@ const styles = stylex.create({
},
transitionProperty: 'opacity, transform',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
diff --git a/packages/core/src/Divider/XDSDivider.tsx b/packages/core/src/Divider/XDSDivider.tsx
index fef65d3b80..02c9dfbd03 100644
--- a/packages/core/src/Divider/XDSDivider.tsx
+++ b/packages/core/src/Divider/XDSDivider.tsx
@@ -44,8 +44,8 @@ export interface XDSDividerProps extends Omit<
/**
* Visual weight of the divider line.
- * - 'subtle': Uses --color-divider (default)
- * - 'strong': Uses --color-divider-emphasized
+ * - 'subtle': Uses --color-border (default)
+ * - 'strong': Uses --color-border-emphasized
* @default 'subtle'
*/
variant?: 'subtle' | 'strong';
@@ -106,10 +106,10 @@ const lineStyles = stylex.create({
flexShrink: 1,
},
subtle: {
- backgroundColor: colorVars['--color-divider'],
+ backgroundColor: colorVars['--color-border'],
},
strong: {
- backgroundColor: colorVars['--color-divider-emphasized'],
+ backgroundColor: colorVars['--color-border-emphasized'],
},
});
diff --git a/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx b/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
index d05cd34898..cbb8391f09 100644
--- a/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
+++ b/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
@@ -35,7 +35,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
textSizeVars,
} from '../theme/tokens.stylex';
@@ -54,7 +54,7 @@ const styles = stylex.create({
opacity: 1,
transitionProperty: 'opacity',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
// Popover container (for anchor positioning)
@@ -102,7 +102,7 @@ const styles = stylex.create({
outline: 'none',
},
itemHighlighted: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
itemDisabled: {
opacity: 0.5,
diff --git a/packages/core/src/Field/XDSFieldStatus.tsx b/packages/core/src/Field/XDSFieldStatus.tsx
index fb06fc7552..13f2ac52f0 100644
--- a/packages/core/src/Field/XDSFieldStatus.tsx
+++ b/packages/core/src/Field/XDSFieldStatus.tsx
@@ -45,15 +45,15 @@ const styles = stylex.create({
const colorStyles = stylex.create({
warning: {
- backgroundColor: colorVars['--color-warning-deemphasized'],
+ backgroundColor: colorVars['--color-warning-muted'],
color: colorVars['--color-yellow-text'],
},
error: {
- backgroundColor: colorVars['--color-negative-deemphasized'],
+ backgroundColor: colorVars['--color-error-muted'],
color: colorVars['--color-red-text'],
},
success: {
- backgroundColor: colorVars['--color-positive-deemphasized'],
+ backgroundColor: colorVars['--color-success-muted'],
color: colorVars['--color-green-text'],
},
});
diff --git a/packages/core/src/Field/inputStyles.stylex.ts b/packages/core/src/Field/inputStyles.stylex.ts
index b66e52954c..d9d6de6e81 100644
--- a/packages/core/src/Field/inputStyles.stylex.ts
+++ b/packages/core/src/Field/inputStyles.stylex.ts
@@ -18,7 +18,7 @@ import {
radiusVars,
shadowVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
/**
@@ -38,32 +38,32 @@ export const inputWrapperStyles = stylex.create({
borderWidth: '1px',
borderStyle: 'solid',
borderColor: {
- default: colorVars['--color-divider-emphasized'],
+ default: colorVars['--color-border-emphasized'],
':hover': {
- '@media (hover: hover)': colorVars['--color-divider-high-contrast'],
+ '@media (hover: hover)': colorVars['--color-border-strong'],
},
},
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
transitionProperty: 'border-color, outline, box-shadow',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
boxShadow: {
default: 'none',
':hover': {
- '@media (hover: hover)': shadowVars['--insetshadow-border-hover'],
+ '@media (hover: hover)': shadowVars['--inset-shadow-border-hover'],
},
},
outline: {
default: 'none',
- ':focus-within': `1px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `1px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: '0',
},
disabled: {
cursor: 'not-allowed',
opacity: 0.5,
- borderColor: colorVars['--color-divider-emphasized'],
+ borderColor: colorVars['--color-border-emphasized'],
},
});
@@ -76,10 +76,10 @@ export const inputStatusBorderStyles = stylex.create({
borderColor: colorVars['--color-warning'],
},
error: {
- borderColor: colorVars['--color-negative'],
+ borderColor: colorVars['--color-error'],
},
success: {
- borderColor: colorVars['--color-positive'],
+ borderColor: colorVars['--color-success'],
},
});
@@ -92,7 +92,7 @@ export const inputStatusHoverShadowStyles = stylex.create({
boxShadow: {
default: 'none',
':hover': {
- '@media (hover: hover)': shadowVars['--insetshadow-border-warning'],
+ '@media (hover: hover)': shadowVars['--inset-shadow-border-warning'],
},
},
},
@@ -100,7 +100,7 @@ export const inputStatusHoverShadowStyles = stylex.create({
boxShadow: {
default: 'none',
':hover': {
- '@media (hover: hover)': shadowVars['--insetshadow-border-negative'],
+ '@media (hover: hover)': shadowVars['--inset-shadow-border-negative'],
},
},
},
@@ -108,7 +108,7 @@ export const inputStatusHoverShadowStyles = stylex.create({
boxShadow: {
default: 'none',
':hover': {
- '@media (hover: hover)': shadowVars['--insetshadow-border-positive'],
+ '@media (hover: hover)': shadowVars['--inset-shadow-border-positive'],
},
},
},
@@ -123,19 +123,19 @@ export const inputStatusFocusWithinStyles = stylex.create({
warning: {
outline: {
default: 'none',
- ':focus-within': `1px solid ${colorVars['--color-focus-outline-warning']}`,
+ ':focus-within': `1px solid ${colorVars['--color-ring-focus-warning']}`,
},
},
error: {
outline: {
default: 'none',
- ':focus-within': `1px solid ${colorVars['--color-focus-outline-error']}`,
+ ':focus-within': `1px solid ${colorVars['--color-ring-focus-error']}`,
},
},
success: {
outline: {
default: 'none',
- ':focus-within': `1px solid ${colorVars['--color-focus-outline-success']}`,
+ ':focus-within': `1px solid ${colorVars['--color-ring-focus-success']}`,
},
},
});
@@ -149,19 +149,19 @@ export const inputStatusFocusStyles = stylex.create({
warning: {
outline: {
default: 'none',
- ':focus': `1px solid ${colorVars['--color-focus-outline-warning']}`,
+ ':focus': `1px solid ${colorVars['--color-ring-focus-warning']}`,
},
},
error: {
outline: {
default: 'none',
- ':focus': `1px solid ${colorVars['--color-focus-outline-error']}`,
+ ':focus': `1px solid ${colorVars['--color-ring-focus-error']}`,
},
},
success: {
outline: {
default: 'none',
- ':focus': `1px solid ${colorVars['--color-focus-outline-success']}`,
+ ':focus': `1px solid ${colorVars['--color-ring-focus-success']}`,
},
},
});
diff --git a/packages/core/src/HoverCard/XDSHoverCard.tsx b/packages/core/src/HoverCard/XDSHoverCard.tsx
index 5e08cbebbc..433ad08fc4 100644
--- a/packages/core/src/HoverCard/XDSHoverCard.tsx
+++ b/packages/core/src/HoverCard/XDSHoverCard.tsx
@@ -35,7 +35,7 @@ const styles = stylex.create({
hoverIndication: {
textDecorationLine: 'underline',
textDecorationStyle: 'dashed',
- textDecorationColor: colorVars['--color-divider-emphasized'],
+ textDecorationColor: colorVars['--color-border-emphasized'],
textUnderlineOffset: '2px',
},
});
diff --git a/packages/core/src/HoverCard/useXDSHoverCard.tsx b/packages/core/src/HoverCard/useXDSHoverCard.tsx
index 08fcb0093a..7a559ab2e3 100644
--- a/packages/core/src/HoverCard/useXDSHoverCard.tsx
+++ b/packages/core/src/HoverCard/useXDSHoverCard.tsx
@@ -27,7 +27,7 @@ import {
import {
colorVars,
durationVars,
- easingVars,
+ easeVars,
shadowVars,
radiusVars,
spacingVars,
@@ -51,7 +51,7 @@ const styles = stylex.create({
// Transitions with allow-discrete for display/overlay
transitionProperty: 'opacity, transform, overlay, display',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transitionBehavior: 'allow-discrete',
// Entry animation starting state
'@starting-style': {
diff --git a/packages/core/src/Icon/Icon.doc.mjs b/packages/core/src/Icon/Icon.doc.mjs
index 4f044ffa96..9740c7fc5a 100644
--- a/packages/core/src/Icon/Icon.doc.mjs
+++ b/packages/core/src/Icon/Icon.doc.mjs
@@ -87,7 +87,7 @@ import {Home} from 'lucide-react';
'String mode wraps the resolved icon in a <span> with fontSize-based sizing so 1em-based registry icons scale correctly.',
'Component mode passes stylex.props directly to the SVG element for zero-overhead styling.',
'Semantic icon names and their usages — close (CloseButton, TimeInput): ✕ close/dismiss; chevronDown (DropdownMenu, Selector, TabMenu): ▾ expand/dropdown; chevronLeft (Calendar): ‹ previous; chevronRight (Calendar): › next; check (Selector, TabMenu): ✓ selected item; checkCircle (Input status): ✓○ success; xCircle (Input status): ✕○ error; warning (Input status): △! warning; info (FieldLabel): ⓘ information tooltip; calendar (DateInput): 📅 date picker; clock (TimeInput): 🕐 time picker; externalLink (Link): ↗ opens in new window.',
- 'Color token mappings — primary: --color-icon-primary (default); secondary: --color-icon-secondary (de-emphasized); tertiary: --color-icon-tertiary (subtle/background); disabled: --color-icon-disabled (disabled state); accent: --color-accent (interactive/actionable); positive: --color-positive (success/confirmation); negative: --color-negative (error/destructive); warning: --color-warning (caution/attention); inherit: currentColor (inherits from parent text color).',
+ 'Color token mappings — primary: --color-icon-primary (default); secondary: --color-icon-secondary (de-emphasized); tertiary: --color-icon-secondary (subtle/background); disabled: --color-icon-disabled (disabled state); accent: --color-accent (interactive/actionable); positive: --color-success (success/confirmation); negative: --color-error (error/destructive); warning: --color-warning (caution/attention); inherit: currentColor (inherits from parent text color).',
'Size dimensions — xsm: 12x12px (dense UI, badges, indicators); sm: 16x16px (inline with text, compact UI); md: 20x20px (default, buttons, inputs); lg: 24x24px (emphasis, standalone icons).',
],
};
@@ -180,7 +180,7 @@ import {Home} from 'lucide-react';
'字符串模式将解析后的图标包装在 <span> 中,使用基于 fontSize 的尺寸,使基于 1em 的注册表图标正确缩放。',
'组件模式将 stylex.props 直接传递给 SVG 元素,实现零开销样式。',
'语义图标名称及其用途——close(CloseButton、TimeInput):✕ 关闭/消除;chevronDown(DropdownMenu、Selector、TabMenu):▾ 展开/下拉;chevronLeft(Calendar):‹ 上一个;chevronRight(Calendar):› 下一个;check(Selector、TabMenu):✓ 已选项;checkCircle(Input 状态):✓○ 成功;xCircle(Input 状态):✕○ 错误;warning(Input 状态):△! 警告;info(FieldLabel):ⓘ 信息提示;calendar(DateInput):📅 日期选择器;clock(TimeInput):🕐 时间选择器;externalLink(Link):↗ 在新窗口中打开。',
- '颜色令牌映射——primary:--color-icon-primary(默认);secondary:--color-icon-secondary(弱化);tertiary:--color-icon-tertiary(微妙/背景);disabled:--color-icon-disabled(禁用状态);accent:--color-accent(交互/可操作);positive:--color-positive(成功/确认);negative:--color-negative(错误/危险);warning:--color-warning(警告/注意);inherit:currentColor(继承父文本颜色)。',
+ '颜色令牌映射——primary:--color-icon-primary(默认);secondary:--color-icon-secondary(弱化);tertiary:--color-icon-secondary(微妙/背景);disabled:--color-icon-disabled(禁用状态);accent:--color-accent(交互/可操作);positive:--color-success(成功/确认);negative:--color-error(错误/危险);warning:--color-warning(警告/注意);inherit:currentColor(继承父文本颜色)。',
'尺寸规格——xsm:12x12px(密集 UI、徽章、指示器);sm:16x16px(与文本内联、紧凑 UI);md:20x20px(默认,按钮、输入框);lg:24x24px(强调、独立图标)。',
],
};
@@ -205,7 +205,7 @@ export const docsDense = {
'String mode wraps in <span> w/ fontSize-based sizing for 1em registry icons.',
'Component mode passes stylex.props directly to SVG for zero-overhead styling.',
'Semantic names: close (CloseButton, TimeInput) chevronDown (DropdownMenu, Selector, TabMenu) chevronLeft/Right (Calendar) check (Selector, TabMenu) checkCircle/xCircle/warning (Input status) info (FieldLabel) calendar (DateInput) clock (TimeInput) externalLink (Link).',
- 'Color tokens: primary=--color-icon-primary; secondary=--color-icon-secondary; tertiary=--color-icon-tertiary; disabled=--color-icon-disabled; accent=--color-accent; positive=--color-positive; negative=--color-negative; warning=--color-warning; inherit=currentColor.',
+ 'Color tokens: primary=--color-icon-primary; secondary=--color-icon-secondary; tertiary=--color-icon-secondary; disabled=--color-icon-disabled; accent=--color-accent; positive=--color-success; negative=--color-error; warning=--color-warning; inherit=currentColor.',
'Size: xsm=12x12px sm=16x16px md=20x20px lg=24x24px.',
],
accessibility: [
diff --git a/packages/core/src/Icon/XDSIcon.tsx b/packages/core/src/Icon/XDSIcon.tsx
index a74c3fd4d8..0d2dcef5ad 100644
--- a/packages/core/src/Icon/XDSIcon.tsx
+++ b/packages/core/src/Icon/XDSIcon.tsx
@@ -51,7 +51,7 @@ const colorStyles = stylex.create({
color: colorVars['--color-icon-secondary'],
},
tertiary: {
- color: colorVars['--color-icon-tertiary'],
+ color: colorVars['--color-icon-secondary'],
},
disabled: {
color: colorVars['--color-icon-disabled'],
@@ -60,10 +60,10 @@ const colorStyles = stylex.create({
color: colorVars['--color-accent'],
},
positive: {
- color: colorVars['--color-positive'],
+ color: colorVars['--color-success'],
},
negative: {
- color: colorVars['--color-negative'],
+ color: colorVars['--color-error'],
},
warning: {
color: colorVars['--color-warning'],
diff --git a/packages/core/src/Kbd/XDSKbd.tsx b/packages/core/src/Kbd/XDSKbd.tsx
index 3e0ef4c773..f275396013 100644
--- a/packages/core/src/Kbd/XDSKbd.tsx
+++ b/packages/core/src/Kbd/XDSKbd.tsx
@@ -40,7 +40,7 @@ const styles = stylex.create({
backgroundColor: colorVars['--color-wash'],
borderBottomWidth: '2px',
borderBottomStyle: 'solid',
- borderBottomColor: colorVars['--color-divider'],
+ borderBottomColor: colorVars['--color-border'],
color: colorVars['--color-text-secondary'],
fontFamily: typographyVars['--font-body'],
fontSize: textSizeVars['--text-xsm'],
diff --git a/packages/core/src/Layout/XDSLayoutFooter.tsx b/packages/core/src/Layout/XDSLayoutFooter.tsx
index 6cc7e2d305..cd9d72e031 100644
--- a/packages/core/src/Layout/XDSLayoutFooter.tsx
+++ b/packages/core/src/Layout/XDSLayoutFooter.tsx
@@ -38,7 +38,7 @@ const styles = stylex.create({
divider: {
borderBlockStartWidth: 1,
borderBlockStartStyle: 'solid',
- borderBlockStartColor: colorVars['--color-divider'],
+ borderBlockStartColor: colorVars['--color-border'],
},
// When no divider, collapse spacing to avoid double-padding with content
collapseTop: {
diff --git a/packages/core/src/Layout/XDSLayoutHeader.tsx b/packages/core/src/Layout/XDSLayoutHeader.tsx
index ccd9c8c01a..a02ed6d647 100644
--- a/packages/core/src/Layout/XDSLayoutHeader.tsx
+++ b/packages/core/src/Layout/XDSLayoutHeader.tsx
@@ -38,7 +38,7 @@ const styles = stylex.create({
divider: {
borderBlockEndWidth: 1,
borderBlockEndStyle: 'solid',
- borderBlockEndColor: colorVars['--color-divider'],
+ borderBlockEndColor: colorVars['--color-border'],
},
// When no divider, collapse spacing to avoid double-padding with content
collapseBottom: {
diff --git a/packages/core/src/Layout/XDSLayoutPanel.tsx b/packages/core/src/Layout/XDSLayoutPanel.tsx
index 735ec441a7..2f57aa123f 100644
--- a/packages/core/src/Layout/XDSLayoutPanel.tsx
+++ b/packages/core/src/Layout/XDSLayoutPanel.tsx
@@ -63,13 +63,13 @@ const styles = stylex.create({
dividerEnd: {
borderInlineEndWidth: 1,
borderInlineEndStyle: 'solid',
- borderInlineEndColor: colorVars['--color-divider'],
+ borderInlineEndColor: colorVars['--color-border'],
},
// For end panel: divider on start edge
dividerStart: {
borderInlineStartWidth: 1,
borderInlineStartStyle: 'solid',
- borderInlineStartColor: colorVars['--color-divider'],
+ borderInlineStartColor: colorVars['--color-border'],
},
// When no divider, collapse spacing on the side facing content
// Start panel: collapse end (right in LTR) to merge with content
diff --git a/packages/core/src/Link/XDSLink.tsx b/packages/core/src/Link/XDSLink.tsx
index 2414b5d6bf..d3b7e60116 100644
--- a/packages/core/src/Link/XDSLink.tsx
+++ b/packages/core/src/Link/XDSLink.tsx
@@ -20,7 +20,7 @@ import * as stylex from '@stylexjs/stylex';
import {
colorVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
lineHeightVars,
spacingVars,
@@ -60,10 +60,10 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'color, text-decoration',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -99,7 +99,7 @@ const linkColorStyles = stylex.create({
color: colorVars['--color-text-disabled'],
},
placeholder: {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
active: {
color: colorVars['--color-accent'],
diff --git a/packages/core/src/List/XDSList.tsx b/packages/core/src/List/XDSList.tsx
index 19da35d42d..8cb1065d60 100644
--- a/packages/core/src/List/XDSList.tsx
+++ b/packages/core/src/List/XDSList.tsx
@@ -112,7 +112,7 @@ const styles = stylex.create({
height: '1px',
border: 'none',
margin: 0,
- backgroundColor: colorVars['--color-divider'],
+ backgroundColor: colorVars['--color-border'],
},
});
diff --git a/packages/core/src/List/XDSListItem.tsx b/packages/core/src/List/XDSListItem.tsx
index d4a1fa816c..6866beda39 100644
--- a/packages/core/src/List/XDSListItem.tsx
+++ b/packages/core/src/List/XDSListItem.tsx
@@ -23,7 +23,7 @@ import {
textSizeVars,
lineHeightVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
import {XDSListContext} from './XDSListContext';
import {xdsClassName, mergeProps} from '../utils';
@@ -151,19 +151,19 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-image',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
},
focusWithinOutline: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -176,7 +176,7 @@ const styles = stylex.create({
pointerEvents: 'none' as const,
},
selected: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
invisibleButton: {
all: 'unset',
diff --git a/packages/core/src/MobileNav/XDSMobileNav.tsx b/packages/core/src/MobileNav/XDSMobileNav.tsx
index 5df6c5637c..a2ef8ab621 100644
--- a/packages/core/src/MobileNav/XDSMobileNav.tsx
+++ b/packages/core/src/MobileNav/XDSMobileNav.tsx
@@ -28,7 +28,7 @@ import * as stylex from '@stylexjs/stylex';
import {
colorVars,
durationVars,
- easingVars,
+ easeVars,
spacingVars,
} from '../theme/tokens.stylex';
import {XDSButton} from '../Button';
@@ -77,7 +77,7 @@ const styles = stylex.create({
opacity: 0,
transitionProperty: 'opacity',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
'@media (prefers-reduced-motion: reduce)': {
'::backdrop': {
@@ -101,7 +101,7 @@ const styles = stylex.create({
overflow: 'hidden',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: 'none',
'@media (prefers-reduced-motion: reduce)': {
transitionDuration: '0.01s',
@@ -111,7 +111,7 @@ const styles = stylex.create({
insetInlineStart: 0,
borderInlineEndWidth: 1,
borderInlineEndStyle: 'solid',
- borderInlineEndColor: colorVars['--color-divider'],
+ borderInlineEndColor: colorVars['--color-border'],
transform: {
default: 'translateX(-100%)',
':is([dir="rtl"] *)': 'translateX(100%)',
@@ -124,7 +124,7 @@ const styles = stylex.create({
insetInlineEnd: 0,
borderInlineStartWidth: 1,
borderInlineStartStyle: 'solid',
- borderInlineStartColor: colorVars['--color-divider'],
+ borderInlineStartColor: colorVars['--color-border'],
transform: {
default: 'translateX(100%)',
':is([dir="rtl"] *)': 'translateX(-100%)',
@@ -142,7 +142,7 @@ const styles = stylex.create({
flexShrink: 0,
borderBlockEndWidth: 1,
borderBlockEndStyle: 'solid',
- borderBlockEndColor: colorVars['--color-divider'],
+ borderBlockEndColor: colorVars['--color-border'],
},
headerNoTitle: {
justifyContent: 'flex-end',
diff --git a/packages/core/src/MoreMenu/XDSMoreMenu.tsx b/packages/core/src/MoreMenu/XDSMoreMenu.tsx
index a6a34905fd..c31d8a73fe 100644
--- a/packages/core/src/MoreMenu/XDSMoreMenu.tsx
+++ b/packages/core/src/MoreMenu/XDSMoreMenu.tsx
@@ -41,7 +41,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
textSizeVars,
} from '../theme/tokens.stylex';
@@ -59,11 +59,11 @@ const styles = stylex.create({
padding: spacingVars['--spacing-1'],
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
- boxShadow: `0 4px 12px ${colorVars['--color-shadow-elevation']}`,
+ boxShadow: `0 4px 12px ${colorVars['--color-shadow']}`,
opacity: 1,
transitionProperty: 'opacity',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
popover: {
minWidth: '160px',
@@ -96,7 +96,7 @@ const styles = stylex.create({
outline: 'none',
},
itemHighlighted: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
itemDisabled: {
opacity: 0.5,
diff --git a/packages/core/src/NavIcon/NavIcon.doc.mjs b/packages/core/src/NavIcon/NavIcon.doc.mjs
index e677489713..54af90233a 100644
--- a/packages/core/src/NavIcon/NavIcon.doc.mjs
+++ b/packages/core/src/NavIcon/NavIcon.doc.mjs
@@ -6,7 +6,7 @@ export const docs = {
'Circular icon container with accent background for navigation headers.',
features: [
'Shared — used in both XDSTopNavHeading and XDSPageNavHeader',
- 'Accent background — uses --color-accent with --color-icon-on-media contrast',
+ 'Accent background — uses --color-accent with --color-icon-on-dark-media contrast',
'Fixed size — renders at the medium (--size-md) design token size',
],
props: [
@@ -61,7 +61,7 @@ export const docsZh = {
'用于导航头部的带强调色背景的圆形图标容器。',
features: [
'共享 — 同时用于 XDSTopNavHeading 和 XDSPageNavHeader',
- '强调色背景 — 使用 --color-accent 配合 --color-icon-on-media 对比色',
+ '强调色背景 — 使用 --color-accent 配合 --color-icon-on-dark-media 对比色',
'固定尺寸 — 以中等尺寸 (--size-md) 设计令牌渲染',
],
props: [
@@ -115,7 +115,7 @@ export const docsDense = {
'Circular icon container w/ accent background for navigation headers.',
features: [
'Shared; used in both XDSTopNavHeading + XDSPageNavHeader',
- 'Accent background; uses --color-accent w/ --color-icon-on-media contrast',
+ 'Accent background; uses --color-accent w/ --color-icon-on-dark-media contrast',
'Fixed size; renders at medium (--size-md) design token size',
],
propDescriptions: {
diff --git a/packages/core/src/NavIcon/XDSNavIcon.tsx b/packages/core/src/NavIcon/XDSNavIcon.tsx
index e510dd7ffe..f72d74bd86 100644
--- a/packages/core/src/NavIcon/XDSNavIcon.tsx
+++ b/packages/core/src/NavIcon/XDSNavIcon.tsx
@@ -28,7 +28,7 @@ const styles = stylex.create({
justifyContent: 'center',
borderRadius: '50%',
backgroundColor: colorVars['--color-accent'],
- color: colorVars['--color-icon-on-media'],
+ color: colorVars['--color-icon-on-dark-media'],
flexShrink: 0,
width: sizeVars['--size-md'],
height: sizeVars['--size-md'],
diff --git a/packages/core/src/NavItem/navItemStyles.stylex.ts b/packages/core/src/NavItem/navItemStyles.stylex.ts
index 27fb7cb6a4..547aa12734 100644
--- a/packages/core/src/NavItem/navItemStyles.stylex.ts
+++ b/packages/core/src/NavItem/navItemStyles.stylex.ts
@@ -64,25 +64,25 @@ export const navItemStyles = stylex.create({
boxSizing: 'border-box',
':hover': {
'@media (hover: hover)': {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
},
':active': {
- backgroundColor: colorVars['--color-pressed-overlay'],
+ backgroundColor: colorVars['--color-overlay-pressed'],
},
},
/** Selected/active page indicator — deemphasized background, medium weight */
selected: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
fontWeight: fontWeightVars['--font-weight-medium'],
':hover': {
'@media (hover: hover)': {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
},
},
':active': {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
},
},
diff --git a/packages/core/src/NumberInput/XDSNumberInput.tsx b/packages/core/src/NumberInput/XDSNumberInput.tsx
index 8b435a666b..b44e5e772f 100644
--- a/packages/core/src/NumberInput/XDSNumberInput.tsx
+++ b/packages/core/src/NumberInput/XDSNumberInput.tsx
@@ -60,7 +60,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
},
inputDisabled: {
diff --git a/packages/core/src/Pagination/XDSPagination.tsx b/packages/core/src/Pagination/XDSPagination.tsx
index b6938dd4b0..3dbb145c64 100644
--- a/packages/core/src/Pagination/XDSPagination.tsx
+++ b/packages/core/src/Pagination/XDSPagination.tsx
@@ -25,7 +25,7 @@ import {
sizeVars,
spacingVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
} from '../theme/tokens.stylex';
import {XDSButton} from '../Button';
@@ -194,14 +194,14 @@ const styles = stylex.create({
borderStyle: 'none',
padding: 0,
borderRadius: '50%',
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
cursor: 'pointer',
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: {
default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
diff --git a/packages/core/src/Popover/XDSPopover.tsx b/packages/core/src/Popover/XDSPopover.tsx
index f11f2b71f0..923bf4c2f5 100644
--- a/packages/core/src/Popover/XDSPopover.tsx
+++ b/packages/core/src/Popover/XDSPopover.tsx
@@ -29,7 +29,7 @@ import type {LayerAlignment, LayerPlacement} from '../Layer/useXDSLayer';
import {
colorVars,
durationVars,
- easingVars,
+ easeVars,
spacingVars,
radiusVars,
shadowVars,
@@ -183,7 +183,7 @@ const styles = stylex.create({
},
transitionProperty: 'opacity, transform, overlay, display',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transitionBehavior: 'allow-discrete',
'@starting-style': {
opacity: 0,
diff --git a/packages/core/src/Popover/useXDSPopover.tsx b/packages/core/src/Popover/useXDSPopover.tsx
index 844d4e191b..3e97206288 100644
--- a/packages/core/src/Popover/useXDSPopover.tsx
+++ b/packages/core/src/Popover/useXDSPopover.tsx
@@ -75,7 +75,7 @@ const styles = stylex.create({
cursor: 'pointer',
borderWidth: 0,
borderStyle: 'none',
- outline: `2px solid ${colorVars['--color-focus-outline']}`,
+ outline: `2px solid ${colorVars['--color-ring-focus']}`,
outlineOffset: 2,
zIndex: 1,
pointerEvents: 'auto', // Re-enable mouse clicks when visible
diff --git a/packages/core/src/ProgressBar/XDSProgressBar.tsx b/packages/core/src/ProgressBar/XDSProgressBar.tsx
index be835ade06..9c978f86a2 100644
--- a/packages/core/src/ProgressBar/XDSProgressBar.tsx
+++ b/packages/core/src/ProgressBar/XDSProgressBar.tsx
@@ -24,7 +24,7 @@ import {
fontWeightVars,
lineHeightVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
import {xdsClassName, mergeProps} from '../utils';
@@ -178,7 +178,7 @@ const styles = stylex.create({
},
track: {
width: '100%',
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
borderRadius: radiusVars['--radius-rounded'],
overflow: 'hidden',
},
@@ -187,7 +187,7 @@ const styles = stylex.create({
borderRadius: radiusVars['--radius-rounded'],
transitionProperty: 'width',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
indeterminateFill: {
height: '100%',
@@ -220,13 +220,13 @@ const variantStyles = stylex.create({
backgroundColor: colorVars['--color-accent'],
},
positive: {
- backgroundColor: colorVars['--color-positive'],
+ backgroundColor: colorVars['--color-success'],
},
warning: {
backgroundColor: colorVars['--color-warning'],
},
negative: {
- backgroundColor: colorVars['--color-negative'],
+ backgroundColor: colorVars['--color-error'],
},
});
diff --git a/packages/core/src/RadioList/XDSRadioListItem.tsx b/packages/core/src/RadioList/XDSRadioListItem.tsx
index 503ba8b463..54530eedf2 100644
--- a/packages/core/src/RadioList/XDSRadioListItem.tsx
+++ b/packages/core/src/RadioList/XDSRadioListItem.tsx
@@ -20,7 +20,7 @@ import {
spacingVars,
textSizeVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
fontWeightVars,
} from '../theme/tokens.stylex';
@@ -60,14 +60,14 @@ const styles = stylex.create({
borderRadius: '50%',
transitionProperty: 'background-color, border-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
boxSizing: 'border-box',
},
radioUnchecked: {
borderColor: {
- default: colorVars['--color-divider-emphasized'],
+ default: colorVars['--color-border-emphasized'],
[stylex.when.ancestor(':hover')]: {
- '@media (hover: hover)': `color-mix(in srgb, ${colorVars['--color-divider-emphasized']}, ${colorVars['--color-hover-tint']} 20%)`,
+ '@media (hover: hover)': `color-mix(in srgb, ${colorVars['--color-border-emphasized']}, ${colorVars['--color-hover-tint']} 20%)`,
},
},
backgroundColor: {
@@ -94,7 +94,7 @@ const styles = stylex.create({
radioWrapperFocus: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -104,14 +104,14 @@ const styles = stylex.create({
},
radioDisabled: {
opacity: 0.5,
- borderColor: colorVars['--color-divider'],
+ borderColor: colorVars['--color-border'],
},
radioDisabledUnchecked: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
},
innerDot: {
borderRadius: '50%',
- backgroundColor: colorVars['--color-icon-on-media'],
+ backgroundColor: colorVars['--color-icon-on-dark-media'],
},
labelWrapper: {
display: 'flex',
diff --git a/packages/core/src/Section/XDSSection.tsx b/packages/core/src/Section/XDSSection.tsx
index 3c7c9cfff5..ce5d734639 100644
--- a/packages/core/src/Section/XDSSection.tsx
+++ b/packages/core/src/Section/XDSSection.tsx
@@ -71,22 +71,22 @@ const dividerStyles = stylex.create({
top: {
borderTopWidth: 1,
borderTopStyle: 'solid',
- borderTopColor: colorVars['--color-divider'],
+ borderTopColor: colorVars['--color-border'],
},
bottom: {
borderBottomWidth: 1,
borderBottomStyle: 'solid',
- borderBottomColor: colorVars['--color-divider'],
+ borderBottomColor: colorVars['--color-border'],
},
start: {
borderInlineStartWidth: 1,
borderInlineStartStyle: 'solid',
- borderInlineStartColor: colorVars['--color-divider'],
+ borderInlineStartColor: colorVars['--color-border'],
},
end: {
borderInlineEndWidth: 1,
borderInlineEndStyle: 'solid',
- borderInlineEndColor: colorVars['--color-divider'],
+ borderInlineEndColor: colorVars['--color-border'],
},
});
diff --git a/packages/core/src/Selector/XDSSelector.tsx b/packages/core/src/Selector/XDSSelector.tsx
index 5f112270b3..beb8bb76fc 100644
--- a/packages/core/src/Selector/XDSSelector.tsx
+++ b/packages/core/src/Selector/XDSSelector.tsx
@@ -38,7 +38,7 @@ import {
radiusVars,
shadowVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
textSizeVars,
fontWeightVars,
@@ -71,9 +71,9 @@ const styles = stylex.create({
borderWidth: 1,
borderStyle: 'solid',
borderColor: {
- default: colorVars['--color-divider-emphasized'],
+ default: colorVars['--color-border-emphasized'],
':hover': {
- '@media (hover: hover)': colorVars['--color-divider-high-contrast'],
+ '@media (hover: hover)': colorVars['--color-border-strong'],
},
},
borderRadius: radiusVars['--radius-2'],
@@ -85,26 +85,26 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'border-color, outline, box-shadow',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
boxShadow: {
default: 'none',
':hover': {
- '@media (hover: hover)': shadowVars['--insetshadow-border-hover'],
+ '@media (hover: hover)': shadowVars['--inset-shadow-border-hover'],
},
},
outline: {
default: 'none',
- ':focus': `1px solid ${colorVars['--color-focus-outline']}`,
+ ':focus': `1px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: '0',
},
triggerDisabled: {
cursor: 'not-allowed',
opacity: 0.5,
- borderColor: colorVars['--color-divider-emphasized'],
+ borderColor: colorVars['--color-border-emphasized'],
},
triggerPlaceholder: {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
triggerIcon: {
flexShrink: 0,
@@ -115,7 +115,7 @@ const styles = stylex.create({
height: 16,
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transformOrigin: 'center',
color: colorVars['--color-icon-secondary'],
},
@@ -135,7 +135,7 @@ const styles = stylex.create({
padding: spacingVars['--spacing-1'],
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
- boxShadow: `0 4px 12px ${colorVars['--color-shadow-elevation']}`,
+ boxShadow: `0 4px 12px ${colorVars['--color-shadow']}`,
opacity: 1,
transition: `opacity ${durationVars['--duration-fast']}`,
},
@@ -195,7 +195,7 @@ const styles = stylex.create({
color: colorVars['--color-icon-primary'],
},
itemHighlighted: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
itemSelected: {
fontWeight: fontWeightVars['--font-weight-medium'],
diff --git a/packages/core/src/SideNav/XDSSideNav.tsx b/packages/core/src/SideNav/XDSSideNav.tsx
index bc4df6371f..5e6dd10360 100644
--- a/packages/core/src/SideNav/XDSSideNav.tsx
+++ b/packages/core/src/SideNav/XDSSideNav.tsx
@@ -91,7 +91,7 @@ const styles = stylex.create({
paddingInline: spacingVars['--spacing-2'],
paddingBlockStart: spacingVars['--spacing-1'],
paddingBlockEnd: spacingVars['--spacing-2'],
- borderBlockStart: `1px solid ${colorVars['--color-divider']}`,
+ borderBlockStart: `1px solid ${colorVars['--color-border']}`,
},
footerRow: {
display: 'flex',
@@ -121,7 +121,7 @@ const styles = stylex.create({
marginBlockStart: 'auto',
gap: spacingVars['--spacing-2'],
paddingBlockStart: spacingVars['--spacing-2'],
- borderBlockStart: `1px solid ${colorVars['--color-divider']}`,
+ borderBlockStart: `1px solid ${colorVars['--color-border']}`,
},
drawerFooterIcons: {
display: 'flex',
@@ -151,7 +151,7 @@ const styles = stylex.create({
},
dragHandleHover: {
// Applied via @media (hover: hover) in the component
- backgroundColor: colorVars['--color-divider'],
+ backgroundColor: colorVars['--color-border'],
},
// Topbar mode — horizontal layout for mobile top bar
topbar: {
diff --git a/packages/core/src/SideNav/XDSSideNavCollapseButton.tsx b/packages/core/src/SideNav/XDSSideNavCollapseButton.tsx
index 4a9269691e..ca27f460e2 100644
--- a/packages/core/src/SideNav/XDSSideNavCollapseButton.tsx
+++ b/packages/core/src/SideNav/XDSSideNavCollapseButton.tsx
@@ -16,7 +16,7 @@
import {useCallback, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {durationVars, easingVars} from '../theme/tokens.stylex';
+import {durationVars, easeVars} from '../theme/tokens.stylex';
import {getIcon} from '../Icon/globalIconRegistry';
import {XDSButton} from '../Button';
import {useXDSSideNavCollapse} from './XDSSideNavCollapseContext';
@@ -32,7 +32,7 @@ const styles = stylex.create({
alignItems: 'center',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronCollapsed: {
transform: 'rotate(180deg)',
diff --git a/packages/core/src/SideNav/XDSSideNavHeading.tsx b/packages/core/src/SideNav/XDSSideNavHeading.tsx
index f1706b1bcb..fc451a5c7b 100644
--- a/packages/core/src/SideNav/XDSSideNavHeading.tsx
+++ b/packages/core/src/SideNav/XDSSideNavHeading.tsx
@@ -67,7 +67,7 @@ const styles = stylex.create({
textAlign: 'start',
':hover': {
'@media (hover: hover)': {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
},
},
@@ -130,7 +130,7 @@ const styles = stylex.create({
padding: spacingVars['--spacing-1'],
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
- boxShadow: `0 4px 12px ${colorVars['--color-shadow-elevation']}`,
+ boxShadow: `0 4px 12px ${colorVars['--color-shadow']}`,
overflow: 'hidden',
},
popover: {
diff --git a/packages/core/src/SideNav/XDSSideNavItem.tsx b/packages/core/src/SideNav/XDSSideNavItem.tsx
index 82dbb5a287..e220c8dde5 100644
--- a/packages/core/src/SideNav/XDSSideNavItem.tsx
+++ b/packages/core/src/SideNav/XDSSideNavItem.tsx
@@ -25,7 +25,7 @@ import {
fontWeightVars,
lineHeightVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
import {XDSIcon} from '../Icon';
import type {XDSIconType} from '../Icon';
@@ -71,7 +71,7 @@ const styles = stylex.create({
gridTemplateRows: '1fr',
transitionProperty: 'grid-template-rows',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
childrenCollapsed: {
gridTemplateRows: '0fr',
@@ -86,7 +86,7 @@ const styles = stylex.create({
alignItems: 'center',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
flexShrink: 0,
},
expandChevronCollapsed: {
diff --git a/packages/core/src/Skeleton/XDSSkeleton.tsx b/packages/core/src/Skeleton/XDSSkeleton.tsx
index b3118b9658..88b777ecb2 100644
--- a/packages/core/src/Skeleton/XDSSkeleton.tsx
+++ b/packages/core/src/Skeleton/XDSSkeleton.tsx
@@ -55,9 +55,8 @@ const skeletonFade = stylex.keyframes({
const styles = stylex.create({
root: {
backgroundColor: {
- default: colorVars['--color-glimmer'],
- '@media (prefers-contrast: more)':
- colorVars['--color-glimmer-high-contrast'],
+ default: colorVars['--color-skeleton'],
+ '@media (prefers-contrast: more)': `color-mix(in srgb, ${colorVars['--color-skeleton']}, ${colorVars['--color-text-primary']} 30%)`,
},
opacity: 0.25,
},
diff --git a/packages/core/src/Slider/XDSSlider.tsx b/packages/core/src/Slider/XDSSlider.tsx
index 8c1f6cba97..80ba72dc1d 100644
--- a/packages/core/src/Slider/XDSSlider.tsx
+++ b/packages/core/src/Slider/XDSSlider.tsx
@@ -27,7 +27,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
textSizeVars,
} from '../theme/tokens.stylex';
@@ -162,7 +162,7 @@ const styles = stylex.create({
},
track: {
position: 'absolute',
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
borderRadius: radiusVars['--radius-rounded'],
},
trackHorizontal: {
@@ -203,7 +203,7 @@ const styles = stylex.create({
transform: 'translate(-50%, -50%)',
transitionProperty: 'background-color, box-shadow',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: 'none',
cursor: 'grab',
zIndex: 1,
@@ -226,7 +226,7 @@ const styles = stylex.create({
thumbFocusWithin: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -234,7 +234,7 @@ const styles = stylex.create({
},
},
thumbDisabled: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
cursor: 'not-allowed',
},
textValue: {
@@ -259,7 +259,7 @@ const styles = stylex.create({
},
mark: {
position: 'absolute',
- backgroundColor: colorVars['--color-divider-emphasized'],
+ backgroundColor: colorVars['--color-border-emphasized'],
borderRadius: radiusVars['--radius-rounded'],
},
markHorizontal: {
diff --git a/packages/core/src/Spinner/XDSSpinner.tsx b/packages/core/src/Spinner/XDSSpinner.tsx
index 2997bc7228..d03f817d37 100644
--- a/packages/core/src/Spinner/XDSSpinner.tsx
+++ b/packages/core/src/Spinner/XDSSpinner.tsx
@@ -129,8 +129,9 @@ export function XDSSpinner({
const computedStyle = getComputedStyle(canvas);
const activeColor =
shade === 'onMedia'
- ? computedStyle.getPropertyValue(colorVars['--color-icon-on-media']) ||
- '#FFFFFF'
+ ? computedStyle.getPropertyValue(
+ colorVars['--color-icon-on-dark-media'],
+ ) || '#FFFFFF'
: computedStyle.getPropertyValue(colorVars['--color-accent']) ||
'#0064E0';
const backgroundColor =
diff --git a/packages/core/src/StatusDot/XDSStatusDot.tsx b/packages/core/src/StatusDot/XDSStatusDot.tsx
index 7e47c879cc..8a19f1563d 100644
--- a/packages/core/src/StatusDot/XDSStatusDot.tsx
+++ b/packages/core/src/StatusDot/XDSStatusDot.tsx
@@ -66,19 +66,19 @@ const sizes = stylex.create({
*/
const variants = stylex.create({
positive: {
- backgroundColor: colorVars['--color-positive'],
+ backgroundColor: colorVars['--color-success'],
},
warning: {
backgroundColor: colorVars['--color-warning'],
},
negative: {
- backgroundColor: colorVars['--color-negative'],
+ backgroundColor: colorVars['--color-error'],
},
info: {
backgroundColor: colorVars['--color-accent'],
},
neutral: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
},
});
diff --git a/packages/core/src/Switch/XDSSwitch.tsx b/packages/core/src/Switch/XDSSwitch.tsx
index b6e245a8bc..85d3e7910c 100644
--- a/packages/core/src/Switch/XDSSwitch.tsx
+++ b/packages/core/src/Switch/XDSSwitch.tsx
@@ -26,7 +26,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
typographyVars,
textSizeVars,
} from '../theme/tokens.stylex';
@@ -93,14 +93,14 @@ const styles = stylex.create({
borderRadius: radiusVars['--radius-rounded'],
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
boxSizing: 'border-box',
},
trackFocus: {
outline: {
default: 'none',
[stylex.when.ancestor(':focus-within')]:
- `2px solid ${colorVars['--color-focus-outline']}`,
+ `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: null,
@@ -135,7 +135,7 @@ const styles = stylex.create({
backgroundColor: colorVars['--color-surface'],
transitionProperty: 'transform, width, height',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
thumbOff: {
width: THUMB_SIZE_OFF,
diff --git a/packages/core/src/TabList/XDSTab.tsx b/packages/core/src/TabList/XDSTab.tsx
index 41afec0679..9a18e3d630 100644
--- a/packages/core/src/TabList/XDSTab.tsx
+++ b/packages/core/src/TabList/XDSTab.tsx
@@ -20,7 +20,7 @@ import {
sizeVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -85,10 +85,10 @@ const styles = stylex.create({
textDecoration: 'none',
transitionProperty: 'color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -96,7 +96,7 @@ const styles = stylex.create({
},
},
selected: {
- color: colorVars['--color-accent-text'],
+ color: colorVars['--color-text-link'],
fontWeight: fontWeightVars['--font-weight-semibold'],
},
underlineSelected: {
@@ -117,7 +117,7 @@ const styles = stylex.create({
left: spacingVars['--spacing-3'],
right: spacingVars['--spacing-3'],
height: '2px',
- backgroundColor: colorVars['--color-divider'],
+ backgroundColor: colorVars['--color-border'],
borderRadius: radiusVars['--radius-rounded'],
opacity: {
default: 0,
@@ -127,7 +127,7 @@ const styles = stylex.create({
},
transitionProperty: 'opacity',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
pointerEvents: 'none',
},
icon: {
diff --git a/packages/core/src/TabList/XDSTabList.tsx b/packages/core/src/TabList/XDSTabList.tsx
index f7593cfe0e..561b981bf3 100644
--- a/packages/core/src/TabList/XDSTabList.tsx
+++ b/packages/core/src/TabList/XDSTabList.tsx
@@ -53,7 +53,7 @@ const styles = stylex.create({
divider: {
borderBottomWidth: '1px',
borderBottomStyle: 'solid',
- borderBottomColor: colorVars['--color-divider'],
+ borderBottomColor: colorVars['--color-border'],
},
});
diff --git a/packages/core/src/TabList/XDSTabMenu.tsx b/packages/core/src/TabList/XDSTabMenu.tsx
index 9c1325f2da..41eebd16be 100644
--- a/packages/core/src/TabList/XDSTabMenu.tsx
+++ b/packages/core/src/TabList/XDSTabMenu.tsx
@@ -22,7 +22,7 @@ import {
sizeVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
shadowVars,
textSizeVars,
fontWeightVars,
@@ -80,10 +80,10 @@ const styles = stylex.create({
textDecoration: 'none',
transitionProperty: 'color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -91,7 +91,7 @@ const styles = stylex.create({
},
},
triggerSelected: {
- color: colorVars['--color-accent-text'],
+ color: colorVars['--color-text-link'],
fontWeight: fontWeightVars['--font-weight-semibold'],
},
triggerLabel: {
@@ -129,7 +129,7 @@ const styles = stylex.create({
left: 0,
right: 0,
height: '2px',
- backgroundColor: colorVars['--color-divider'],
+ backgroundColor: colorVars['--color-border'],
borderRadius: radiusVars['--radius-rounded'],
opacity: {
default: 0,
@@ -139,7 +139,7 @@ const styles = stylex.create({
},
transitionProperty: 'opacity',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
pointerEvents: 'none',
},
chevron: {
@@ -148,7 +148,7 @@ const styles = stylex.create({
flexShrink: 0,
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronOpen: {
transform: 'rotate(180deg)',
@@ -180,16 +180,16 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
},
menuItemSelected: {
diff --git a/packages/core/src/Table/XDSTableCell.tsx b/packages/core/src/Table/XDSTableCell.tsx
index 3650908a6a..14793a153a 100644
--- a/packages/core/src/Table/XDSTableCell.tsx
+++ b/packages/core/src/Table/XDSTableCell.tsx
@@ -60,7 +60,7 @@ const dividerRowStyles = stylex.create({
cell: {
borderBottomWidth: '1px',
borderBottomStyle: 'solid',
- borderBottomColor: colorVars['--color-divider'],
+ borderBottomColor: colorVars['--color-border'],
},
});
@@ -71,7 +71,7 @@ const dividerColumnStyles = stylex.create({
':last-child': '0',
},
borderRightStyle: 'solid',
- borderRightColor: colorVars['--color-divider'],
+ borderRightColor: colorVars['--color-border'],
},
});
diff --git a/packages/core/src/Table/XDSTableHeaderCell.tsx b/packages/core/src/Table/XDSTableHeaderCell.tsx
index 3239d17a9e..c3a3d16451 100644
--- a/packages/core/src/Table/XDSTableHeaderCell.tsx
+++ b/packages/core/src/Table/XDSTableHeaderCell.tsx
@@ -71,7 +71,7 @@ const headerDividerStyles = stylex.create({
cell: {
borderBottomWidth: '1px',
borderBottomStyle: 'solid',
- borderBottomColor: colorVars['--color-divider'],
+ borderBottomColor: colorVars['--color-border'],
},
});
@@ -82,7 +82,7 @@ const dividerColumnStyles = stylex.create({
':last-child': '0',
},
borderRightStyle: 'solid',
- borderRightColor: colorVars['--color-divider'],
+ borderRightColor: colorVars['--color-border'],
},
});
diff --git a/packages/core/src/Table/XDSTableRow.tsx b/packages/core/src/Table/XDSTableRow.tsx
index 6c56197872..6f69aa3e90 100644
--- a/packages/core/src/Table/XDSTableRow.tsx
+++ b/packages/core/src/Table/XDSTableRow.tsx
@@ -14,7 +14,7 @@
import {useContext, type ReactNode} from 'react';
import type {XDSBaseProps} from '../XDSBaseProps';
import * as stylex from '@stylexjs/stylex';
-import {colorVars, durationVars, easingVars} from '../theme/tokens.stylex';
+import {colorVars, durationVars, easeVars} from '../theme/tokens.stylex';
import type {StyleXStyles} from '../theme/types';
import {XDSTableContext} from './XDSTableContext';
import {xdsClassName, mergeProps} from '../utils';
@@ -45,12 +45,12 @@ const hoverRowStyles = stylex.create({
backgroundColor: {
default: null,
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
});
@@ -60,12 +60,12 @@ const stripedHoverRowStyles = stylex.create({
default: null,
':nth-child(even)': colorVars['--color-wash'],
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
});
diff --git a/packages/core/src/Table/plugins/selection/useXDSTableSelection.tsx b/packages/core/src/Table/plugins/selection/useXDSTableSelection.tsx
index 102fc5c961..d50db4c961 100644
--- a/packages/core/src/Table/plugins/selection/useXDSTableSelection.tsx
+++ b/packages/core/src/Table/plugins/selection/useXDSTableSelection.tsx
@@ -102,7 +102,7 @@ function SelectionRowCheckbox<T>({item}: {item: T}) {
const selectedRowStyles = stylex.create({
row: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
});
diff --git a/packages/core/src/Text/text.stylex.ts b/packages/core/src/Text/text.stylex.ts
index e049d5149d..c583803685 100644
--- a/packages/core/src/Text/text.stylex.ts
+++ b/packages/core/src/Text/text.stylex.ts
@@ -26,7 +26,7 @@ export const colorStyles = stylex.create({
color: colorVars['--color-text-disabled'],
},
placeholder: {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
active: {
color: colorVars['--color-accent'],
diff --git a/packages/core/src/TextArea/XDSTextArea.tsx b/packages/core/src/TextArea/XDSTextArea.tsx
index 7e30c76050..bca38432b6 100644
--- a/packages/core/src/TextArea/XDSTextArea.tsx
+++ b/packages/core/src/TextArea/XDSTextArea.tsx
@@ -59,7 +59,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
resize: 'vertical',
minHeight: '80px',
@@ -76,7 +76,7 @@ const styles = stylex.create({
color: colorVars['--color-text-secondary'],
},
counterError: {
- color: colorVars['--color-negative'],
+ color: colorVars['--color-error'],
},
});
diff --git a/packages/core/src/TextInput/XDSTextInput.tsx b/packages/core/src/TextInput/XDSTextInput.tsx
index 7ec54984bd..1890425382 100644
--- a/packages/core/src/TextInput/XDSTextInput.tsx
+++ b/packages/core/src/TextInput/XDSTextInput.tsx
@@ -53,7 +53,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
},
inputDisabled: {
diff --git a/packages/core/src/TimeInput/XDSTimeInput.tsx b/packages/core/src/TimeInput/XDSTimeInput.tsx
index fdd26f7d0a..09aafbb699 100644
--- a/packages/core/src/TimeInput/XDSTimeInput.tsx
+++ b/packages/core/src/TimeInput/XDSTimeInput.tsx
@@ -76,7 +76,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
},
inputDisabled: {
@@ -98,7 +98,7 @@ const styles = stylex.create({
borderRadius: radiusVars['--radius-2'],
outline: {
default: 'none',
- ':focus-visible': `1px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `1px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: 1,
},
diff --git a/packages/core/src/Token/XDSToken.tsx b/packages/core/src/Token/XDSToken.tsx
index 09a795f999..7636e4cb7d 100644
--- a/packages/core/src/Token/XDSToken.tsx
+++ b/packages/core/src/Token/XDSToken.tsx
@@ -20,7 +20,7 @@ import {
radiusVars,
sizeVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -162,17 +162,17 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-image',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -207,7 +207,7 @@ const styles = stylex.create({
focusWithinOutline: {
outline: {
default: null,
- ':focus-within': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -229,7 +229,7 @@ const styles = stylex.create({
color: 'inherit',
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
'::after': {
content: '""',
@@ -253,7 +253,7 @@ const sizeStyles = stylex.create({
const colorStyles = stylex.create({
default: {
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-secondary'],
color: colorVars['--color-text-primary'],
},
red: {
diff --git a/packages/core/src/Tokenizer/XDSTokenizer.tsx b/packages/core/src/Tokenizer/XDSTokenizer.tsx
index 55376c09a7..68919c31dd 100644
--- a/packages/core/src/Tokenizer/XDSTokenizer.tsx
+++ b/packages/core/src/Tokenizer/XDSTokenizer.tsx
@@ -173,8 +173,8 @@ const styles = stylex.create({
},
wrapperWithTokens: {
// Override padding for border concentricity: token border-radius
- // (radius-content: 4px) sits concentric with wrapper border-radius
- // (radius-element: 8px) when inset = radius-element - radius-content - border
+ // (radius-1: 4px) sits concentric with wrapper border-radius
+ // (radius-2: 8px) when inset = radius-2 - radius-1 - border
// = 8 - 4 - 1 = 3px.
paddingBlock: `calc(${spacingVars['--spacing-1']} - 1px)`,
paddingInline: `calc(${spacingVars['--spacing-1']} - 1px)`,
diff --git a/packages/core/src/Tooltip/XDSTooltip.tsx b/packages/core/src/Tooltip/XDSTooltip.tsx
index 696db012db..58a4add74a 100644
--- a/packages/core/src/Tooltip/XDSTooltip.tsx
+++ b/packages/core/src/Tooltip/XDSTooltip.tsx
@@ -34,7 +34,7 @@ const styles = stylex.create({
hoverIndication: {
textDecorationLine: 'underline',
textDecorationStyle: 'dashed',
- textDecorationColor: colorVars['--color-divider-emphasized'],
+ textDecorationColor: colorVars['--color-border-emphasized'],
textUnderlineOffset: '2px',
},
});
diff --git a/packages/core/src/Tooltip/useXDSTooltip.tsx b/packages/core/src/Tooltip/useXDSTooltip.tsx
index c926c908e7..0c62cc37c7 100644
--- a/packages/core/src/Tooltip/useXDSTooltip.tsx
+++ b/packages/core/src/Tooltip/useXDSTooltip.tsx
@@ -27,7 +27,7 @@ import {
import {
colorVars,
durationVars,
- easingVars,
+ easeVars,
radiusVars,
spacingVars,
typographyVars,
@@ -57,7 +57,7 @@ const styles = stylex.create({
// Transitions with allow-discrete for display/overlay
transitionProperty: 'opacity, transform, overlay, display',
transitionDuration: durationVars['--duration-fast-min'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transitionBehavior: 'allow-discrete',
// Entry animation starting state
'@starting-style': {
diff --git a/packages/core/src/TopNav/XDSTopNavItem.tsx b/packages/core/src/TopNav/XDSTopNavItem.tsx
index 6dad1a19e8..fbb02ab5e6 100644
--- a/packages/core/src/TopNav/XDSTopNavItem.tsx
+++ b/packages/core/src/TopNav/XDSTopNavItem.tsx
@@ -21,7 +21,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -51,17 +51,17 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color, color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
- ':active': colorVars['--color-pressed-overlay'],
+ ':active': colorVars['--color-overlay-pressed'],
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -72,11 +72,11 @@ const styles = stylex.create({
color: colorVars['--color-text-primary'],
fontWeight: fontWeightVars['--font-weight-semibold'],
backgroundColor: {
- default: colorVars['--color-deemphasized'],
+ default: colorVars['--color-muted'],
':hover': {
- '@media (hover: hover)': colorVars['--color-deemphasized'],
+ '@media (hover: hover)': colorVars['--color-muted'],
},
- ':active': colorVars['--color-deemphasized'],
+ ':active': colorVars['--color-muted'],
},
},
iconOnly: {
@@ -86,7 +86,7 @@ const styles = stylex.create({
drawerFocus: {
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
diff --git a/packages/core/src/TopNav/XDSTopNavMegaMenu.tsx b/packages/core/src/TopNav/XDSTopNavMegaMenu.tsx
index 9de47f273a..ed19f1855c 100644
--- a/packages/core/src/TopNav/XDSTopNavMegaMenu.tsx
+++ b/packages/core/src/TopNav/XDSTopNavMegaMenu.tsx
@@ -27,7 +27,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -61,16 +61,16 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color, color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -81,14 +81,14 @@ const styles = stylex.create({
},
triggerOpen: {
color: colorVars['--color-text-primary'],
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
chevron: {
display: 'inline-flex',
alignItems: 'center',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronOpen: {
transform: 'rotate(180deg)',
@@ -105,7 +105,7 @@ const styles = stylex.create({
},
transitionProperty: 'opacity, transform, overlay, display',
transitionDuration: durationVars['--duration-medium-min'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
transitionBehavior: 'allow-discrete',
'@starting-style': {
opacity: 0,
@@ -115,7 +115,7 @@ const styles = stylex.create({
// Visual styles for the panel content container.
panelContainer: {
backgroundColor: colorVars['--color-popover'],
- borderTop: `1px solid ${colorVars['--color-divider']}`,
+ borderTop: `1px solid ${colorVars['--color-border']}`,
borderTopLeftRadius: 0,
borderTopRightRadius: 0,
borderBottomLeftRadius: radiusVars['--radius-3'],
@@ -143,7 +143,7 @@ const styles = stylex.create({
flexShrink: 1,
flexBasis: 200,
borderRadius: radiusVars['--radius-3'],
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
overflow: 'hidden',
display: 'flex',
flexDirection: 'column',
@@ -166,7 +166,7 @@ const styles = stylex.create({
display: 'inline-flex',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
drawerChevronExpanded: {
transform: 'rotate(180deg)',
@@ -176,7 +176,7 @@ const styles = stylex.create({
gridTemplateRows: '0fr',
transitionProperty: 'grid-template-rows',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
drawerItemsExpanded: {
gridTemplateRows: '1fr',
@@ -191,7 +191,7 @@ const styles = stylex.create({
marginBlockStart: spacingVars['--spacing-2'],
marginInlineStart: spacingVars['--spacing-6'],
borderRadius: radiusVars['--radius-3'],
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
overflow: 'hidden',
},
});
diff --git a/packages/core/src/TopNav/XDSTopNavMegaMenuFeaturedCard.tsx b/packages/core/src/TopNav/XDSTopNavMegaMenuFeaturedCard.tsx
index d16af1ba29..a6ac45dd07 100644
--- a/packages/core/src/TopNav/XDSTopNavMegaMenuFeaturedCard.tsx
+++ b/packages/core/src/TopNav/XDSTopNavMegaMenuFeaturedCard.tsx
@@ -61,7 +61,7 @@ const styles = stylex.create({
fontSize: textSizeVars['--text-sm'],
fontWeight: fontWeightVars['--font-weight-semibold'],
lineHeight: lineHeightVars['--leading-snug'],
- color: colorVars['--color-accent-text'],
+ color: colorVars['--color-text-link'],
textDecoration: 'none',
},
});
diff --git a/packages/core/src/TopNav/XDSTopNavMegaMenuItem.tsx b/packages/core/src/TopNav/XDSTopNavMegaMenuItem.tsx
index e13b8beec3..df35533b98 100644
--- a/packages/core/src/TopNav/XDSTopNavMegaMenuItem.tsx
+++ b/packages/core/src/TopNav/XDSTopNavMegaMenuItem.tsx
@@ -19,7 +19,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -46,18 +46,18 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
- ':active': colorVars['--color-pressed-overlay'],
+ ':active': colorVars['--color-overlay-pressed'],
},
border: 'none',
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -76,7 +76,7 @@ const styles = stylex.create({
width: 40,
height: 40,
borderRadius: radiusVars['--radius-2'],
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
flexShrink: 0,
color: colorVars['--color-icon-secondary'],
},
@@ -111,7 +111,7 @@ const styles = stylex.create({
width: 32,
height: 32,
borderRadius: radiusVars['--radius-2'],
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
flexShrink: 0,
color: colorVars['--color-icon-secondary'],
marginBlockStart: spacingVars['--spacing-0-5'],
diff --git a/packages/core/src/TopNav/XDSTopNavMenu.tsx b/packages/core/src/TopNav/XDSTopNavMenu.tsx
index 297d066b50..2078c3d7d6 100644
--- a/packages/core/src/TopNav/XDSTopNavMenu.tsx
+++ b/packages/core/src/TopNav/XDSTopNavMenu.tsx
@@ -31,7 +31,7 @@ import {
spacingVars,
radiusVars,
durationVars,
- easingVars,
+ easeVars,
textSizeVars,
fontWeightVars,
lineHeightVars,
@@ -58,16 +58,16 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color, color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -78,14 +78,14 @@ const styles = stylex.create({
},
triggerOpen: {
color: colorVars['--color-text-primary'],
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
chevron: {
display: 'inline-flex',
alignItems: 'center',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronOpen: {
transform: 'rotate(180deg)',
@@ -114,17 +114,17 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundColor: {
default: 'transparent',
':hover': {
- '@media (hover: hover)': colorVars['--color-hover-overlay'],
+ '@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
border: 'none',
outline: {
default: null,
- ':focus-visible': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-visible': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -138,7 +138,7 @@ const styles = stylex.create({
width: 40,
height: 40,
borderRadius: radiusVars['--radius-2'],
- backgroundColor: colorVars['--color-deemphasized'],
+ backgroundColor: colorVars['--color-muted'],
flexShrink: 0,
},
menuItemContent: {
@@ -175,7 +175,7 @@ const drawerStyles = stylex.create({
display: 'inline-flex',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronExpanded: {
transform: 'rotate(180deg)',
@@ -185,7 +185,7 @@ const drawerStyles = stylex.create({
gridTemplateRows: '0fr',
transitionProperty: 'grid-template-rows',
transitionDuration: durationVars['--duration-medium'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
itemsExpanded: {
gridTemplateRows: '1fr',
diff --git a/packages/core/src/TreeList/XDSTreeListBranches.tsx b/packages/core/src/TreeList/XDSTreeListBranches.tsx
index 9a4716836c..b541304307 100644
--- a/packages/core/src/TreeList/XDSTreeListBranches.tsx
+++ b/packages/core/src/TreeList/XDSTreeListBranches.tsx
@@ -28,7 +28,7 @@ const styles = stylex.create({
position: 'absolute',
right: 0,
width: LINE_WIDTH,
- backgroundColor: colorVars['--color-divider-emphasized'],
+ backgroundColor: colorVars['--color-border-emphasized'],
},
verticalFull: {
height: 'calc(100% + 1px)',
@@ -50,7 +50,7 @@ const styles = stylex.create({
top: '50%',
transform: 'translateY(-50%)',
width: '50%',
- backgroundColor: colorVars['--color-divider-emphasized'],
+ backgroundColor: colorVars['--color-border-emphasized'],
},
horizontalLineFull: {
width: '100%',
diff --git a/packages/core/src/TreeList/XDSTreeListItem.tsx b/packages/core/src/TreeList/XDSTreeListItem.tsx
index 469b861a91..806b574648 100644
--- a/packages/core/src/TreeList/XDSTreeListItem.tsx
+++ b/packages/core/src/TreeList/XDSTreeListItem.tsx
@@ -20,7 +20,7 @@ import {
textSizeVars,
lineHeightVars,
durationVars,
- easingVars,
+ easeVars,
} from '../theme/tokens.stylex';
import {getIcon} from '../Icon/globalIconRegistry';
import {
@@ -76,19 +76,19 @@ const styles = stylex.create({
cursor: 'pointer',
transitionProperty: 'background-image',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
backgroundImage: {
default: null,
':hover': {
- '@media (hover: hover)': `linear-gradient(${colorVars['--color-hover-overlay']}, ${colorVars['--color-hover-overlay']})`,
+ '@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
- ':active': `linear-gradient(${colorVars['--color-pressed-overlay']}, ${colorVars['--color-pressed-overlay']})`,
+ ':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
},
focusWithinOutline: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-focus-outline']}`,
+ ':focus-within': `2px solid ${colorVars['--color-ring-focus']}`,
},
outlineOffset: {
default: '0',
@@ -101,7 +101,7 @@ const styles = stylex.create({
pointerEvents: 'none' as const,
},
selected: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
invisibleButton: {
all: 'unset',
@@ -181,7 +181,7 @@ const styles = stylex.create({
display: 'flex',
transitionProperty: 'transform',
transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easingVars['--easing-standard'],
+ transitionTimingFunction: easeVars['--ease-standard'],
},
chevronExpanded: {
transform: 'rotate(90deg)',
diff --git a/packages/core/src/Typeahead/XDSBaseTypeahead.tsx b/packages/core/src/Typeahead/XDSBaseTypeahead.tsx
index be981396ad..527302a2be 100644
--- a/packages/core/src/Typeahead/XDSBaseTypeahead.tsx
+++ b/packages/core/src/Typeahead/XDSBaseTypeahead.tsx
@@ -165,7 +165,7 @@ const styles = stylex.create({
backgroundColor: 'transparent',
outline: 'none',
'::placeholder': {
- color: colorVars['--color-text-placeholder'],
+ color: colorVars['--color-text-secondary'],
},
},
inputDisabled: {
@@ -178,7 +178,7 @@ const styles = stylex.create({
padding: spacingVars['--spacing-1'],
borderRadius: radiusVars['--radius-2'],
backgroundColor: colorVars['--color-surface'],
- boxShadow: `0 4px 12px ${colorVars['--color-shadow-elevation']}`,
+ boxShadow: `0 4px 12px ${colorVars['--color-shadow']}`,
},
popover: {
minWidth: 'anchor-size(width)',
@@ -201,7 +201,7 @@ const styles = stylex.create({
textAlign: 'left',
},
itemHighlighted: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
itemSelected: {
fontWeight: fontWeightVars['--font-weight-medium'],
diff --git a/packages/core/src/reset.css b/packages/core/src/reset.css
index b3c140451a..582cb1368f 100644
--- a/packages/core/src/reset.css
+++ b/packages/core/src/reset.css
@@ -250,7 +250,7 @@
*/
:where(input::placeholder, textarea::placeholder) {
opacity: 1;
- color: var(--color-text-placeholder, #9ca3af);
+ color: var(--color-text-secondary, #9ca3af);
}
/*
diff --git a/packages/core/src/theme/defineTheme.ts b/packages/core/src/theme/defineTheme.ts
index 9fc3ae6fa5..b563498275 100644
--- a/packages/core/src/theme/defineTheme.ts
+++ b/packages/core/src/theme/defineTheme.ts
@@ -37,7 +37,7 @@ import {
radiusDefaults,
shadowDefaults,
durationDefaults,
- easingDefaults,
+ easeDefaults,
transitionDefaults,
typographyDefaults,
textSizeDefaults,
@@ -71,7 +71,7 @@ export type XDSTokenName =
| keyof typeof radiusDefaults
| keyof typeof shadowDefaults
| keyof typeof durationDefaults
- | keyof typeof easingDefaults
+ | keyof typeof easeDefaults
| keyof typeof transitionDefaults
| keyof typeof typographyDefaults
| keyof typeof textSizeDefaults
@@ -111,7 +111,7 @@ export type XDSStyleOverrides = Record<string, string>;
* 'variant:destructive+size:sm': { padding: '2px 6px' },
* },
* badge: {
- * 'variant:ghost': { border: '1px solid var(--color-divider)' },
+ * 'variant:ghost': { border: '1px solid var(--color-border)' },
* },
* }
* ```
@@ -237,7 +237,7 @@ export const xdsTokenDefaults: Record<string, string> = {
...radiusDefaults,
...shadowDefaults,
...durationDefaults,
- ...easingDefaults,
+ ...easeDefaults,
...transitionDefaults,
...typographyDefaults,
...textSizeDefaults,
@@ -466,7 +466,7 @@ export function generateThemeRules(theme: XDSDefinedTheme): string[] {
parts.push(` hr {
border: none;
- border-top: 1px solid var(--color-divider);
+ border-top: 1px solid var(--color-border);
}`);
// 4. Prop-level color overrides (for text/heading/link specificity)
@@ -474,7 +474,7 @@ export function generateThemeRules(theme: XDSDefinedTheme): string[] {
primary: 'var(--color-text-primary)',
secondary: 'var(--color-text-secondary)',
disabled: 'var(--color-text-disabled)',
- placeholder: 'var(--color-text-placeholder)',
+ placeholder: 'var(--color-text-secondary)',
active: 'var(--color-accent)',
};
diff --git a/packages/core/src/theme/expandMotionScale.test.ts b/packages/core/src/theme/expandMotionScale.test.ts
index d4d9499882..f0d6ebbb36 100644
--- a/packages/core/src/theme/expandMotionScale.test.ts
+++ b/packages/core/src/theme/expandMotionScale.test.ts
@@ -38,7 +38,7 @@ describe('expandMotionScale', () => {
it('does not include easing token when not specified', () => {
const tokens = expandMotionScale({fast: 175, medium: 410, ratio: 0.75});
- expect(tokens['--easing-standard']).toBeUndefined();
+ expect(tokens['--ease-standard']).toBeUndefined();
});
it('includes easing override when specified', () => {
@@ -49,7 +49,7 @@ describe('expandMotionScale', () => {
easing: 'cubic-bezier(0.0, 0.0, 0.2, 1)',
});
- expect(tokens['--easing-standard']).toBe('cubic-bezier(0.0, 0.0, 0.2, 1)');
+ expect(tokens['--ease-standard']).toBe('cubic-bezier(0.0, 0.0, 0.2, 1)');
});
it('produces exactly 6 duration tokens', () => {
diff --git a/packages/core/src/theme/expandMotionScale.ts b/packages/core/src/theme/expandMotionScale.ts
index 5ca960ea07..ad9da42976 100644
--- a/packages/core/src/theme/expandMotionScale.ts
+++ b/packages/core/src/theme/expandMotionScale.ts
@@ -51,7 +51,7 @@ export interface XDSMotionScaleConfig {
* Typical range: 0.65–0.85. Default: 0.75.
*/
ratio: number;
- /** Optional easing curve override for --easing-standard. */
+ /** Optional easing curve override for --ease-standard. */
easing?: string;
}
@@ -98,9 +98,9 @@ export function expandMotionScale(
'--duration-medium-max': `${roundMs(medium / ratio)}ms`,
};
- // Easing override (optional — default comes from easingDefaults)
+ // Easing override (optional — default comes from easeDefaults)
if (easing) {
- tokens['--easing-standard'] = easing;
+ tokens['--ease-standard'] = easing;
}
return tokens;
diff --git a/packages/core/src/theme/index.ts b/packages/core/src/theme/index.ts
index c0ab2df64a..0bc8000b4d 100644
--- a/packages/core/src/theme/index.ts
+++ b/packages/core/src/theme/index.ts
@@ -51,7 +51,7 @@ export {
radiusDefaults,
shadowDefaults,
durationDefaults,
- easingDefaults,
+ easeDefaults,
transitionDefaults,
typographyDefaults,
textSizeDefaults,
@@ -64,7 +64,7 @@ export {
radiusVars,
shadowVars,
durationVars,
- easingVars,
+ easeVars,
transitionVars,
typographyVars,
textSizeVars,
@@ -81,7 +81,7 @@ export type {
RadiusVarName,
ShadowVarName,
DurationVarName,
- EasingVarName,
+ EaseVarName,
TransitionVarName,
TypographyVarName,
TextSizeVarName,
diff --git a/packages/core/src/theme/tokens.stylex.ts b/packages/core/src/theme/tokens.stylex.ts
index a363d3ba71..7b933603da 100644
--- a/packages/core/src/theme/tokens.stylex.ts
+++ b/packages/core/src/theme/tokens.stylex.ts
@@ -17,58 +17,55 @@ import * as stylex from '@stylexjs/stylex';
export const colorDefaults = {
// Core semantic
'--color-accent': 'light-dark(#0064E0, #2694FE)',
- '--color-accent-deemphasized': 'light-dark(#0082FB33, #0082FB3F)',
- '--color-accent-text': 'light-dark(#0143B5, #4BA9FE)',
+ '--color-accent-muted': 'light-dark(#0082FB33, #0082FB3F)',
+ '--color-secondary':
+ 'light-dark(rgba(5, 54, 89, 0.1), rgba(223, 226, 229, 0.2))',
'--color-surface': 'light-dark(#FFFFFF, #1F1F22)',
'--color-wash': 'light-dark(#F1F4F7, #111112)',
'--color-overlay': 'light-dark(#01122866, #11111299)',
- '--color-hover-overlay': 'light-dark(#0536590C, #FFFFFF0C)',
- '--color-pressed-overlay': 'light-dark(#05365919, #FFFFFF19)',
- '--color-focus-outline': 'light-dark(#0171E3, #2694FE)',
- '--color-focus-outline-error': 'light-dark(#E3193B, #F5394F)',
- '--color-focus-outline-success': 'light-dark(#0D8626, #0D8626)',
- '--color-focus-outline-warning': 'light-dark(#F2C00B, #E9AF08)',
- '--color-deemphasized': 'light-dark(#0536590C, #1111127F)',
+ '--color-overlay-hover': 'light-dark(#0536590C, #FFFFFF0C)',
+ '--color-overlay-pressed': 'light-dark(#05365919, #FFFFFF19)',
+ '--color-ring-focus': 'light-dark(#0171E3, #2694FE)',
+ '--color-ring-focus-error': 'light-dark(#E3193B, #F5394F)',
+ '--color-ring-focus-success': 'light-dark(#0D8626, #0D8626)',
+ '--color-ring-focus-warning': 'light-dark(#F2C00B, #E9AF08)',
+ '--color-muted': 'light-dark(#0536590C, #1111127F)',
// Text
'--color-text-primary': 'light-dark(#0A1317, #DFE2E5)',
'--color-text-secondary': 'light-dark(#4E606F, #AAAFB5)',
'--color-text-disabled': 'light-dark(#A4B0BC, #6F747C)',
'--color-text-link': 'light-dark(#0064E0, #3E9EFB)',
- '--color-text-placeholder': 'light-dark(#4E606F, #AAAFB5)',
- '--color-text-on-media': 'light-dark(#FFFFFF, #FFFFFF)',
+ '--color-text-on-dark-media': 'light-dark(#FFFFFF, #FFFFFF)',
// Icon
'--color-icon-primary': 'light-dark(#0A1317, #DFE2E5)',
'--color-icon-secondary': 'light-dark(#4E606F, #AAAFB5)',
- '--color-icon-tertiary': 'light-dark(#748695, #8C939B)',
'--color-icon-disabled': 'light-dark(#A4B0BC, #6F747C)',
- '--color-icon-on-media': 'light-dark(#FFFFFF, #FFFFFF)',
+ '--color-icon-on-dark-media': 'light-dark(#FFFFFF, #FFFFFF)',
// Surface variants
'--color-card': 'light-dark(#FFFFFF, #1F1F22)',
'--color-popover': 'light-dark(#FFFFFF, #28292C)',
// Status/Sentiment
- '--color-positive': 'light-dark(#0D8626, #0D8626)',
- '--color-positive-deemphasized': 'light-dark(#0B991F33, #0B991F3F)',
- '--color-negative': 'light-dark(#E3193B, #F5394F)',
- '--color-negative-deemphasized': 'light-dark(#E3193B33, #F5394F3F)',
+ '--color-success': 'light-dark(#0D8626, #0D8626)',
+ '--color-success-muted': 'light-dark(#0B991F33, #0B991F3F)',
+ '--color-error': 'light-dark(#E3193B, #F5394F)',
+ '--color-error-muted': 'light-dark(#E3193B33, #F5394F3F)',
'--color-warning': 'light-dark(#E9AF08, #F2C00B)',
- '--color-warning-deemphasized': 'light-dark(#E2A40033, #E2A4003F)',
- '--color-educational': 'light-dark(#5B08D8, #6B1EFD)',
- '--color-educational-deemphasized': 'light-dark(#7952FF33, #5B08D83F)',
+ '--color-warning-muted': 'light-dark(#E2A40033, #E2A4003F)',
+ '--color-info': 'light-dark(#5B08D8, #6B1EFD)',
+ '--color-info-muted': 'light-dark(#7952FF33, #5B08D83F)',
- // Divider
- '--color-divider': 'light-dark(#05365919, #F2F4F619)',
- '--color-divider-high-contrast': 'light-dark(#647685, #6F747C)',
- '--color-divider-emphasized': 'light-dark(#CCD3DB, #494D53)',
+ // Border
+ '--color-border': 'light-dark(#05365919, #F2F4F619)',
+ '--color-border-strong': 'light-dark(#647685, #6F747C)',
+ '--color-border-emphasized': 'light-dark(#CCD3DB, #494D53)',
// Effects
- '--color-glimmer': 'light-dark(#CCD3DB, #5A5E66)',
- '--color-glimmer-high-contrast': 'light-dark(#A4B0BC, #8C939B)',
- '--color-shadow-elevation':
- 'light-dark(rgba(5, 54, 89, 0.1), rgba(0, 0, 0, 0.3))',
+ '--color-skeleton': 'light-dark(#CCD3DB, #5A5E66)',
+ '--color-shadow': 'light-dark(rgba(5, 54, 89, 0.1), rgba(0, 0, 0, 0.3))',
// Hover tint: black in light mode, white in dark mode - used with color-mix for hover states
'--color-hover-tint': 'light-dark(black, white)',
@@ -203,7 +200,7 @@ export const radiusVars = stylex.defineVars(radiusDefaults);
// =============================================================================
// Outer shadows: shadow-base (subtle) → shadow-dialog (strongest).
// Names encode use-case categories for LLM-friendly reasoning.
-// Inset shadows: insetshadow-border-* for input state rings.
+// Inset shadows: inset-shadow-border-* for input state rings.
export const shadowDefaults = {
// Outer elevation shadows (ascending intensity: base < menu < hover < dialog)
@@ -215,13 +212,14 @@ export const shadowDefaults = {
'--shadow-dialog':
'0px 2px 2px light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.2)), 0px 8px 24px light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.3))',
// Inset shadows for input border rings (interaction + validation states)
- '--insetshadow-border-hover': 'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.3)',
- '--insetshadow-border-accent': 'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.5)',
- '--insetshadow-border-positive':
+ '--inset-shadow-border-hover': 'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.3)',
+ '--inset-shadow-border-accent':
+ 'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.5)',
+ '--inset-shadow-border-positive':
'inset 0px 0px 0px 2px rgba(38, 167, 86, 0.3)',
- '--insetshadow-border-warning':
+ '--inset-shadow-border-warning':
'inset 0px 0px 0px 2px rgba(226, 164, 0, 0.3)',
- '--insetshadow-border-negative':
+ '--inset-shadow-border-negative':
'inset 0px 0px 0px 2px rgba(227, 25, 59, 0.3)',
} as const;
@@ -254,28 +252,28 @@ export type DurationVarName = keyof typeof durationDefaults;
// Motion Tokens — Easing
// =============================================================================
-export const easingDefaults = {
- '--easing-standard': 'cubic-bezier(0.24, 1, 0.4, 1)',
+export const easeDefaults = {
+ '--ease-standard': 'cubic-bezier(0.24, 1, 0.4, 1)',
} as const;
-export const easingVars = stylex.defineVars(easingDefaults);
+export const easeVars = stylex.defineVars(easeDefaults);
-export type EasingVarName = keyof typeof easingDefaults;
+export type EaseVarName = keyof typeof easeDefaults;
// =============================================================================
// Motion Tokens — Deprecated (transition shorthand)
// =============================================================================
-/** @deprecated Use durationVars + easingVars instead */
+/** @deprecated Use durationVars + easeVars instead */
export const transitionDefaults = {
'--transition-fast': '0.15s ease',
'--transition-normal': '0.2s ease',
} as const;
-/** @deprecated Use durationVars + easingVars instead */
+/** @deprecated Use durationVars + easeVars instead */
export const transitionRaw = transitionDefaults;
-/** @deprecated Use durationVars + easingVars instead */
+/** @deprecated Use durationVars + easeVars instead */
export const transitionVars = stylex.defineVars(transitionDefaults);
// =============================================================================
@@ -360,7 +358,7 @@ export type SpacingVarName = keyof typeof spacingDefaults;
export type SizeVarName = keyof typeof sizeDefaults;
export type RadiusVarName = keyof typeof radiusDefaults;
export type ShadowVarName = keyof typeof shadowDefaults;
-/** @deprecated Use DurationVarName | EasingVarName instead */
+/** @deprecated Use DurationVarName | EaseVarName instead */
export type TransitionVarName = keyof typeof transitionDefaults;
export type TypographyVarName = keyof typeof typographyDefaults;
export type TextSizeVarName = keyof typeof textSizeDefaults;
diff --git a/packages/lab/src/CommandPalette/XDSCommandPaletteItem.tsx b/packages/lab/src/CommandPalette/XDSCommandPaletteItem.tsx
index 28229da3b5..ca1630d30f 100644
--- a/packages/lab/src/CommandPalette/XDSCommandPaletteItem.tsx
+++ b/packages/lab/src/CommandPalette/XDSCommandPaletteItem.tsx
@@ -53,19 +53,19 @@ const styles = stylex.create({
itemHover: {
':hover': {
[HOVER_HOVER]: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
},
},
itemHighlighted: {
- backgroundColor: colorVars['--color-hover-overlay'],
+ backgroundColor: colorVars['--color-overlay-hover'],
},
itemDisabled: {
opacity: 0.5,
cursor: 'not-allowed',
},
itemSelected: {
- backgroundColor: colorVars['--color-accent-deemphasized'],
+ backgroundColor: colorVars['--color-accent-muted'],
},
});
diff --git a/packages/themes/brutalist/src/index.ts b/packages/themes/brutalist/src/index.ts
index 5bc7e82dc4..97bdc58fb1 100644
--- a/packages/themes/brutalist/src/index.ts
+++ b/packages/themes/brutalist/src/index.ts
@@ -23,7 +23,7 @@ export const brutalistTheme = defineTheme({
tokens: {
// Colors — high contrast, no subtlety
'--color-accent': ['#FF1493', '#FF69B4'],
- '--color-accent-deemphasized': ['#FF149333', '#FF69B43F'],
+ '--color-accent-muted': ['#FF149333', '#FF69B43F'],
'--color-surface': ['#FFFFFF', '#000000'],
'--color-wash': ['#F5F5F5', '#111111'],
'--color-card': ['#FFFFFF', '#000000'],
diff --git a/packages/themes/neutral/src/neutralTheme.ts b/packages/themes/neutral/src/neutralTheme.ts
index 8b5088b5fe..b417303b95 100644
--- a/packages/themes/neutral/src/neutralTheme.ts
+++ b/packages/themes/neutral/src/neutralTheme.ts
@@ -41,49 +41,44 @@ export const neutralTheme = defineTheme({
// Core semantic
'--color-accent': ['oklch(0.205 0 0)', 'oklch(0.922 0 0)'],
- '--color-accent-deemphasized': ['oklch(0.97 0 0)', 'oklch(0.269 0 0)'],
- '--color-accent-text': ['oklch(0.205 0 0)', 'oklch(0.985 0 0)'],
+ '--color-accent-muted': ['oklch(0.97 0 0)', 'oklch(0.269 0 0)'],
+ '--color-secondary': ['oklch(0 0 0 / 6%)', 'oklch(1 0 0 / 10%)'],
'--color-surface': ['oklch(1 0 0)', 'oklch(0.145 0 0)'],
'--color-wash': ['oklch(0.97 0 0)', 'oklch(0.269 0 0)'],
'--color-overlay': ['oklch(0 0 0 / 50%)', 'oklch(0 0 0 / 80%)'],
- '--color-hover-overlay': ['oklch(0 0 0 / 5%)', 'oklch(1 0 0 / 5%)'],
- '--color-pressed-overlay': ['oklch(0 0 0 / 10%)', 'oklch(1 0 0 / 10%)'],
- '--color-focus-outline': ['oklch(0.708 0 0)', 'oklch(0.556 0 0)'],
- '--color-focus-outline-error': ['#E3193B', '#F5394F'],
- '--color-focus-outline-success': ['#0D8626', '#0D8626'],
- '--color-focus-outline-warning': ['#F2C00B', '#E9AF08'],
- '--color-deemphasized': ['oklch(0.97 0 0)', 'oklch(0.269 0 0)'],
+ '--color-overlay-hover': ['oklch(0 0 0 / 5%)', 'oklch(1 0 0 / 5%)'],
+ '--color-overlay-pressed': ['oklch(0 0 0 / 10%)', 'oklch(1 0 0 / 10%)'],
+ '--color-ring-focus': ['oklch(0.708 0 0)', 'oklch(0.556 0 0)'],
+ '--color-ring-focus-error': ['#E3193B', '#F5394F'],
+ '--color-ring-focus-success': ['#0D8626', '#0D8626'],
+ '--color-ring-focus-warning': ['#F2C00B', '#E9AF08'],
+ '--color-muted': ['oklch(0.97 0 0)', 'oklch(0.269 0 0)'],
// Text
'--color-text-primary': ['oklch(0.145 0 0)', 'oklch(0.985 0 0)'],
'--color-text-secondary': ['oklch(0.556 0 0)', 'oklch(0.708 0 0)'],
'--color-text-disabled': ['oklch(0.708 0 0)', 'oklch(0.439 0 0)'],
'--color-text-link': ['oklch(0.205 0 0)', 'oklch(0.922 0 0)'],
- '--color-text-placeholder': ['oklch(0.556 0 0)', 'oklch(0.556 0 0)'],
- '--color-text-on-media': ['oklch(1 0 0)', 'oklch(0.145 0 0)'],
+ '--color-text-on-dark-media': ['oklch(1 0 0)', 'oklch(0.145 0 0)'],
// Icon
'--color-icon-primary': ['oklch(0.145 0 0)', 'oklch(0.985 0 0)'],
'--color-icon-secondary': ['oklch(0.556 0 0)', 'oklch(0.708 0 0)'],
- '--color-icon-tertiary': ['oklch(0.708 0 0)', 'oklch(0.556 0 0)'],
'--color-icon-disabled': ['oklch(0.708 0 0)', 'oklch(0.439 0 0)'],
- '--color-icon-on-media': ['oklch(1 0 0)', 'oklch(0.145 0 0)'],
+ '--color-icon-on-dark-media': ['oklch(1 0 0)', 'oklch(0.145 0 0)'],
// Surface variants
'--color-card': ['oklch(1 0 0)', 'oklch(0.205 0 0)'],
'--color-popover': ['oklch(1 0 0)', 'oklch(0.269 0 0)'],
// Status/Sentiment
- '--color-positive': ['oklch(0.6 0.15 145)', 'oklch(0.7 0.15 145)'],
- '--color-positive-deemphasized': [
+ '--color-success': ['oklch(0.6 0.15 145)', 'oklch(0.7 0.15 145)'],
+ '--color-success-muted': [
'oklch(0.6 0.15 145 / 20%)',
'oklch(0.7 0.15 145 / 20%)',
],
- '--color-negative': [
- 'oklch(0.577 0.245 27.325)',
- 'oklch(0.704 0.191 22.216)',
- ],
- '--color-negative-deemphasized': [
+ '--color-error': ['oklch(0.577 0.245 27.325)', 'oklch(0.704 0.191 22.216)'],
+ '--color-error-muted': [
'oklch(0.577 0.245 27.325 / 20%)',
'oklch(0.704 0.191 22.216 / 20%)',
],
@@ -91,28 +86,24 @@ export const neutralTheme = defineTheme({
'oklch(0.828 0.189 84.429)',
'oklch(0.769 0.188 70.08)',
],
- '--color-warning-deemphasized': [
+ '--color-warning-muted': [
'oklch(0.828 0.189 84.429 / 20%)',
'oklch(0.769 0.188 70.08 / 20%)',
],
- '--color-educational': [
- 'oklch(0.488 0.243 264.376)',
- 'oklch(0.627 0.265 303.9)',
- ],
- '--color-educational-deemphasized': [
+ '--color-info': ['oklch(0.488 0.243 264.376)', 'oklch(0.627 0.265 303.9)'],
+ '--color-info-muted': [
'oklch(0.488 0.243 264.376 / 20%)',
'oklch(0.627 0.265 303.9 / 20%)',
],
- // Divider
- '--color-divider': ['oklch(0.922 0 0)', 'oklch(1 0 0 / 10%)'],
- '--color-divider-high-contrast': ['oklch(0.708 0 0)', 'oklch(0.556 0 0)'],
- '--color-divider-emphasized': ['oklch(0.85 0 0)', 'oklch(0.371 0 0)'],
+ // Border
+ '--color-border': ['oklch(0.922 0 0)', 'oklch(1 0 0 / 10%)'],
+ '--color-border-strong': ['oklch(0.708 0 0)', 'oklch(0.556 0 0)'],
+ '--color-border-emphasized': ['oklch(0.85 0 0)', 'oklch(0.371 0 0)'],
// Effects
- '--color-glimmer': ['oklch(0.922 0 0)', 'oklch(0.371 0 0)'],
- '--color-glimmer-high-contrast': ['oklch(0.85 0 0)', 'oklch(0.439 0 0)'],
- '--color-shadow-elevation': ['oklch(0 0 0 / 10%)', 'oklch(0 0 0 / 30%)'],
+ '--color-skeleton': ['oklch(0.922 0 0)', 'oklch(0.371 0 0)'],
+ '--color-shadow': ['oklch(0 0 0 / 10%)', 'oklch(0 0 0 / 30%)'],
'--color-hover-tint': ['black', 'white'],
// Blue
@@ -279,15 +270,15 @@ export const neutralTheme = defineTheme({
'0 2px 4px light-dark(oklch(0 0 0 / 5%), oklch(0 0 0 / 15%)), 0 4px 12px light-dark(oklch(0 0 0 / 10%), oklch(0 0 0 / 20%))',
'--shadow-dialog':
'0 4px 6px light-dark(oklch(0 0 0 / 10%), oklch(0 0 0 / 25%)), 0 12px 24px light-dark(oklch(0 0 0 / 15%), oklch(0 0 0 / 35%))',
- '--insetshadow-border-hover':
+ '--inset-shadow-border-hover':
'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.3)',
- '--insetshadow-border-accent':
+ '--inset-shadow-border-accent':
'inset 0px 0px 0px 2px rgba(1, 113, 227, 0.5)',
- '--insetshadow-border-positive':
+ '--inset-shadow-border-positive':
'inset 0px 0px 0px 2px rgba(38, 167, 86, 0.3)',
- '--insetshadow-border-warning':
+ '--inset-shadow-border-warning':
'inset 0px 0px 0px 2px rgba(226, 164, 0, 0.3)',
- '--insetshadow-border-negative':
+ '--inset-shadow-border-negative':
'inset 0px 0px 0px 2px rgba(227, 25, 59, 0.3)',
// =========================================================================
@@ -311,7 +302,7 @@ export const neutralTheme = defineTheme({
'variant:secondary': {
borderWidth: '1px',
borderStyle: 'solid',
- borderColor: 'var(--color-divider)',
+ borderColor: 'var(--color-border)',
},
},