From def479a820191ca2e2a79c2aea7e5729df96b6d8 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Thu, 26 Feb 2026 16:53:14 +0100 Subject: [PATCH 1/2] feat(typography): migrate xds typography component --- packages/x-design-system/demo/src/app.vue | 2 + .../demo/src/components/typography.vue | 31 +++++++ .../x-design-system/lib/components/index.css | 1 + .../lib/components/typography.css | 89 +++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 packages/x-design-system/demo/src/components/typography.vue create mode 100644 packages/x-design-system/lib/components/typography.css diff --git a/packages/x-design-system/demo/src/app.vue b/packages/x-design-system/demo/src/app.vue index 1ed87dfd46..1aa8568793 100644 --- a/packages/x-design-system/demo/src/app.vue +++ b/packages/x-design-system/demo/src/app.vue @@ -6,6 +6,7 @@ + diff --git a/packages/x-design-system/demo/src/components/typography.vue b/packages/x-design-system/demo/src/components/typography.vue new file mode 100644 index 0000000000..298ea40a93 --- /dev/null +++ b/packages/x-design-system/demo/src/components/typography.vue @@ -0,0 +1,31 @@ + + + diff --git a/packages/x-design-system/lib/components/index.css b/packages/x-design-system/lib/components/index.css index 26119a320f..358b6f7850 100644 --- a/packages/x-design-system/lib/components/index.css +++ b/packages/x-design-system/lib/components/index.css @@ -5,3 +5,4 @@ @import './highlight.css'; @import './input.css'; @import './progress-bar.css'; +@import './typography.css'; diff --git a/packages/x-design-system/lib/components/typography.css b/packages/x-design-system/lib/components/typography.css new file mode 100644 index 0000000000..6bf4ab4103 --- /dev/null +++ b/packages/x-design-system/lib/components/typography.css @@ -0,0 +1,89 @@ +/* text1 */ +@utility text1 { + @apply xds:font-family-main xds:font-regular; + @apply xds:text1-md; +} +@utility text1-sm { + @apply xds:text-xs/(--xds-line-height-lg); +} +@utility text1-md { + @apply xds:text-sm/(--xds-line-height-md); +} +@utility text1-lg { + @apply xds:text-md; +} + +/* text2 */ +@utility text2 { + @apply xds:font-family-main xds:font-regular; + @apply xds:text2-md; +} +@utility text2-sm { + @apply xds:text-xs/(--xds-line-height-lg); +} +@utility text2-md { + @apply xds:text-sm/(--xds-line-height-md); +} +@utility text2-lg { + @apply xds:text-md; +} + +/* title1 */ +@utility title1 { + @apply xds:font-family-main xds:font-bold; + @apply xds:title1-md; +} +@utility title1-sm { + @apply xds:text-xl/(--xds-line-height-md); +} +@utility title1-md { + @apply xds:text-2xl/(--xds-line-height-sm); +} +@utility title1-lg { + @apply xds:text-4xl; +} + +/* title2 */ +@utility title2 { + @apply xds:font-family-main xds:font-bold; + @apply xds:title2-md; +} +@utility title2-sm { + @apply xds:text-lg; +} +@utility title2-md { + @apply xds:text-xl/(--xds-line-height-md); +} +@utility title2-lg { + @apply xds:text-3xl/(--xds-line-height-sm); +} + +/* title3 */ +@utility title3 { + @apply xds:font-family-main xds:font-bold; + @apply xds:title3-md; +} +@utility title3-sm { + @apply xds:text-sm; +} +@utility title3-md { + @apply xds:text-md/(--xds-line-height-md); +} +@utility title3-lg { + @apply xds:text-xl; +} + +/* title4 */ +@utility title4 { + @apply xds:font-family-main xds:font-bold; + @apply xds:title4-md; +} +@utility title4-sm { + @apply xds:text-xs; +} +@utility title4-md { + @apply xds:text-sm/(--xds-line-height-md); +} +@utility title4-lg { + @apply xds:text-lg; +} From b7036a29f8686b4589c465d37090718f20348351 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Thu, 26 Feb 2026 17:24:52 +0100 Subject: [PATCH 2/2] fix: minor things --- packages/x-design-system/demo/shims-vue.d.ts | 3 +-- packages/x-design-system/demo/src/components/icon.vue | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/x-design-system/demo/shims-vue.d.ts b/packages/x-design-system/demo/shims-vue.d.ts index 0bcd215127..bfd7bde37a 100644 --- a/packages/x-design-system/demo/shims-vue.d.ts +++ b/packages/x-design-system/demo/shims-vue.d.ts @@ -1,7 +1,6 @@ declare module '*.vue' { import type { DefineComponent } from 'vue' - // eslint-disable-next-line ts/no-empty-object-type - const component: DefineComponent<{}, {}, any> + const component: DefineComponent export default component } diff --git a/packages/x-design-system/demo/src/components/icon.vue b/packages/x-design-system/demo/src/components/icon.vue index aa3e2e0c41..0447220538 100644 --- a/packages/x-design-system/demo/src/components/icon.vue +++ b/packages/x-design-system/demo/src/components/icon.vue @@ -139,7 +139,6 @@ const rows = [ 'background-color', 'sharp', 'stroke-width', - 'icon-offset', 'combinations', ]