Skip to content

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

TypeScript

fix: rename @layer xds-reset to @layer reset (#833)

Cindy Zhangf68e41b4b072
diff --git a/README.md b/README.md
index b4111884df..30aba72f29 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ import '@xds/core/reset.css'; // Base reset — box-sizing, margins, etc.
import '@xds/core/typography.css'; // Prose styles — headings, lists, code, etc.
```
-The reset uses `@layer reset` and typography uses `@layer typography`, so they won't conflict with component styles.
+The reset uses `@layer reset`, so it won't conflict with component styles.
### 2. Set Up the Theme Provider
diff --git a/apps/example-vite/README.md b/apps/example-vite/README.md
index a278b8561c..dcaaa19d24 100644
--- a/apps/example-vite/README.md
+++ b/apps/example-vite/README.md
@@ -67,7 +67,7 @@ export default defineConfig({
{
tag: 'style',
children:
- '@layer reset, typography, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9, xds.theme;',
+ '@layer reset, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9, xds.theme;',
injectTo: 'head-prepend',
},
];
diff --git a/apps/example-vite/vite.config.ts b/apps/example-vite/vite.config.ts
index 93e76d3811..82efe2e384 100644
--- a/apps/example-vite/vite.config.ts
+++ b/apps/example-vite/vite.config.ts
@@ -34,7 +34,7 @@ export default defineConfig({
{
tag: 'style',
children:
- '@layer reset, typography, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9, xds.theme;',
+ '@layer reset, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9, xds.theme;',
injectTo: 'head-prepend',
},
];
diff --git a/apps/sandbox/src/app/layout.tsx b/apps/sandbox/src/app/layout.tsx
index 509a9549be..cf14bb9a8e 100644
--- a/apps/sandbox/src/app/layout.tsx
+++ b/apps/sandbox/src/app/layout.tsx
@@ -4,7 +4,7 @@ import type {Metadata} from 'next';
* XDS CSS Layer Model (dist path)
*
* Import order establishes CSS layer priority (lowest → highest):
- * 1. @xds/core/reset.css → @layer xds-reset (reset styles)
+ * 1. @xds/core/reset.css → @layer reset (reset styles)
* 2. @xds/core/xds.css → @layer xds-base (component base styles)
* 3. @xds/theme-default/theme.css → @layer xds-theme (default theme)
* 4. @xds/theme-neutral/theme.css → @layer xds-theme (neutral theme)
diff --git a/apps/storybook/.storybook/main.ts b/apps/storybook/.storybook/main.ts
index d6d1c5ec47..1c9ccd24e9 100644
--- a/apps/storybook/.storybook/main.ts
+++ b/apps/storybook/.storybook/main.ts
@@ -76,7 +76,7 @@ const config: StorybookConfig = {
{
tag: 'style',
children:
- '@layer reset, typography, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9;',
+ '@layer reset, priority1, priority2, priority3, priority4, priority5, priority6, priority7, priority8, priority9;',
injectTo: 'head-prepend',
},
];
diff --git a/packages/core/src/reset.css b/packages/core/src/reset.css
index ef3d8c586e..41176e6949 100644
--- a/packages/core/src/reset.css
+++ b/packages/core/src/reset.css
@@ -19,11 +19,11 @@
* import '@xds/core/reset.css';
*
* 2. Combine with theme and typography:
- * import '@xds/core/reset.css'; // @layer xds-reset — clean slate
+ * import '@xds/core/reset.css'; // @layer reset — clean slate
* import '@xds/core/xds.css'; // @layer xds-base — component styles
* import '@xds/theme-default/theme.css'; // @layer xds-theme — theme overrides
*
- * Layer order: xds-reset → xds-base → xds-theme
+ * Layer order: reset → xds-base → xds-theme
* Consumer styles (unlayered) always override all XDS layers.
* The reset has the lowest priority and can be overridden by any other layer.
*
@@ -34,7 +34,7 @@
* - modern-normalize
*/
-@layer xds-reset {
+@layer reset {
/* ===========================================================================
Box Model