From 058aaff161ac6c9749c00488d02dbe9ef0e285a9 Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Mon, 7 Oct 2024 09:58:33 +0200 Subject: [PATCH 1/2] lux small tokens toegevoegd & utrecht font-sizes voor secondary en subtle --- .../src/imported/component/link.json | 2 +- .../src/imported/nl/utrecht-button.json | 234 +++++++++++------- .../src/imported/nl/utrecht-heading.json | 2 +- .../src/imported/nl/utrecht-link.json | 2 +- 4 files changed, 141 insertions(+), 99 deletions(-) diff --git a/proprietary/design-tokens/src/imported/component/link.json b/proprietary/design-tokens/src/imported/component/link.json index 8e042975a..db7ab88ef 100644 --- a/proprietary/design-tokens/src/imported/component/link.json +++ b/proprietary/design-tokens/src/imported/component/link.json @@ -77,4 +77,4 @@ } } } -} +} \ No newline at end of file diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-button.json b/proprietary/design-tokens/src/imported/nl/utrecht-button.json index 20cfaedb1..ea5d64c67 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-button.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-button.json @@ -29,6 +29,110 @@ "type": "fontSizes", "value": "{lux.button.font-size}" }, + "primary-action": { + "font-size": { + "type": "fontSizes", + "value": "{lux.button.primary.font-size}" + }, + "background-color": { + "type": "color", + "value": "{lux.button.primary.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.border-color}" + }, + "border-width": { + "type": "borderWidth", + "value": "{lux.button.border-width}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.color}" + }, + "font-weight": { + "type": "fontWeights", + "value": "{lux.button.font-weight}" + }, + "active": { + "background-color": { + "type": "color", + "value": "{lux.button.primary.active.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.active.border-color}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.active.color}" + } + }, + "disabled": { + "background-color": { + "type": "color", + "value": "{lux.button.primary.disabled.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.disabled.border-color}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.disabled.color}" + } + }, + "hover": { + "background-color": { + "type": "color", + "value": "{lux.button.primary.hover.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.hover.border-color}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.hover.color}" + }, + "scale": { + "type": "other", + "value": "{no-token}" + } + }, + "focus": { + "background-color": { + "type": "color", + "value": "{lux.button.primary.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.hover.border-color}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.color}" + } + }, + "pressed": { + "background-color": { + "type": "color", + "value": "{lux.button.primary.hover.background-color}" + }, + "border-color": { + "type": "color", + "value": "{lux.button.primary.hover.border-color}" + }, + "color": { + "type": "color", + "value": "{lux.button.primary.hover.color}" + } + }, + "line-height": { + "value": "{lux.button.line-height}", + "type": "lineHeights" + } + }, "font-weight": { "type": "fontWeights", "value": "{lux.button.font-weight}" @@ -162,102 +266,6 @@ "value": "{utrecht.button.color}" } }, - "primary-action": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.border-color}" - }, - "border-width": { - "type": "borderWidth", - "value": "{lux.button.border-width}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.color}" - }, - "font-weight": { - "type": "fontWeights", - "value": "{lux.button.font-weight}" - }, - "active": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.active.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.active.border-color}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.active.color}" - } - }, - "disabled": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.disabled.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.disabled.border-color}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.disabled.color}" - } - }, - "hover": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.hover.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.hover.border-color}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.hover.color}" - }, - "scale": { - "type": "other", - "value": "{no-token}" - } - }, - "focus": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.hover.border-color}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.color}" - } - }, - "pressed": { - "background-color": { - "type": "color", - "value": "{lux.button.primary.hover.background-color}" - }, - "border-color": { - "type": "color", - "value": "{lux.button.primary.hover.border-color}" - }, - "color": { - "type": "color", - "value": "{lux.button.primary.hover.color}" - } - } - }, "secondary-action": { "background-color": { "type": "color", @@ -352,6 +360,14 @@ "type": "color", "value": "{lux.button.secondary.hover.color}" } + }, + "line-height": { + "value": "{lux.button.line-height}", + "type": "lineHeights" + }, + "font-size": { + "type": "fontSizes", + "value": "{lux.button.font-size}" } }, "subtle": { @@ -448,6 +464,32 @@ "type": "color", "value": "{lux.button.tertiary.hover.color}" } + }, + "line-height": { + "value": "{lux.button.line-height}", + "type": "lineHeights" + }, + "font-size": { + "type": "fontSizes", + "value": "{lux.button.font-size}" + } + } + } + }, + "lux": { + "button": { + "small": { + "min-block-size": { + "value": "2rem", + "type": "sizing" + }, + "padding-block-end": { + "value": "{lux.space.25}", + "type": "spacing" + }, + "padding-block-start": { + "value": "{lux.space.25}", + "type": "spacing" } } } diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-heading.json b/proprietary/design-tokens/src/imported/nl/utrecht-heading.json index a2305d8a5..889ea9fd7 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-heading.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-heading.json @@ -133,4 +133,4 @@ } } } -} +} \ No newline at end of file diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-link.json b/proprietary/design-tokens/src/imported/nl/utrecht-link.json index 96f060a90..5f4ff99c9 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-link.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-link.json @@ -97,4 +97,4 @@ } } } -} +} \ No newline at end of file From e7bd7a17817ff63d5e8db74d19ceecbd30dc5790 Mon Sep 17 00:00:00 2001 From: Jaap-Hein Wester Date: Mon, 7 Oct 2024 10:53:36 +0200 Subject: [PATCH 2/2] Changeset added --- .changeset/fifty-lizards-promise.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/fifty-lizards-promise.md diff --git a/.changeset/fifty-lizards-promise.md b/.changeset/fifty-lizards-promise.md new file mode 100644 index 000000000..48cc0251f --- /dev/null +++ b/.changeset/fifty-lizards-promise.md @@ -0,0 +1,8 @@ +--- +"@lux-design-system/design-tokens": minor +--- + +In deze commit + +- Nieuwe tokens: lux component button - smalle variant +- Wijziging tokens: line-height en font-size tokens voor secondary en subtle button toegevoegd