From a6637193ec9ff2b46f760ad329fcedc4809c26cd Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:31:53 +0100 Subject: [PATCH 1/5] Figma text area tokens voor row-height toevoegen --- .../src/imported/nl/utrecht-textarea.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json index ca8f82b6..d2e2f6bd 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json @@ -150,5 +150,23 @@ "type": "fontSizes" } } + }, + "figma": { + "textarea": { + "4-rows": { + "block-size": { + "value": "4 * {lux.line-height.body.default}", + "type": "sizing", + "description": "4 * lineheight " + } + }, + "8-rows": { + "block-size": { + "value": "8 * {lux.line-height.body.default}", + "type": "sizing", + "description": "4 * lineheight " + } + } + } } } \ No newline at end of file From 862880d76d7bb7aa567b2cd9dd06694b526ad85c Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:46:00 +0100 Subject: [PATCH 2/5] text-input blocksize erbij --- .../src/imported/nl/utrecht-text-input.json | 8 ++++++++ .../src/imported/nl/utrecht-textarea.json | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json index 3421d8e1..2c1c03b6 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json @@ -160,5 +160,13 @@ } } } + }, + "figma": { + "textbox": { + "block-size": { + "value": "{utrecht.textbox.line-height} + {utrecht.textbox.padding-block-start} + {utrecht.textbox.padding-block-end}", + "type": "sizing" + } + } } } \ No newline at end of file diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json index d2e2f6bd..314f863d 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json @@ -155,14 +155,24 @@ "textarea": { "4-rows": { "block-size": { - "value": "4 * {lux.line-height.body.default}", + "value": "4 * {utrecht.textarea.line-height}", + "type": "sizing", + "description": "4 * lineheight " + }, + "block-size-2": { + "value": "4 * {utrecht.textarea.line-height} + {utrecht.textarea.padding-block-start} + {utrecht.textarea.padding-block-end}", "type": "sizing", "description": "4 * lineheight " } }, "8-rows": { "block-size": { - "value": "8 * {lux.line-height.body.default}", + "value": "8 * {utrecht.textarea.line-height}", + "type": "sizing", + "description": "4 * lineheight " + }, + "block-size-2": { + "value": "8 * {utrecht.textarea.line-height} + {utrecht.textarea.padding-block-start} + {utrecht.textarea.padding-block-end}", "type": "sizing", "description": "4 * lineheight " } From cfc35f47e38ea2b79f6fa598d37c0acf426a6fa9 Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:12:02 +0100 Subject: [PATCH 3/5] update, text-input eraf + v2 van block-size text area. De hoogte komt op de value en placeholder --- .../design-tokens/src/imported/$themes.json | 12 ++++++++---- .../src/imported/nl/utrecht-text-input.json | 8 -------- .../src/imported/nl/utrecht-textarea.json | 14 ++++---------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json index 0b0638e5..7cfe96fd 100644 --- a/proprietary/design-tokens/src/imported/$themes.json +++ b/proprietary/design-tokens/src/imported/$themes.json @@ -988,7 +988,8 @@ "selectedTokenSets": { "NLdoc/default": "enabled" }, - "group": "NLdoc" + "group": "NLdoc", + "$figmaVariableReferences": {} }, { "id": "5a579e9a45428a1c218461931b7d72ff86cf798f", @@ -997,7 +998,8 @@ "selectedTokenSets": { "NLdoc/Rijksoverheid": "enabled" }, - "group": "NLdoc" + "group": "NLdoc", + "$figmaVariableReferences": {} }, { "id": "5252df7c6782827fd088a497c11f04326060cffe", @@ -1006,7 +1008,8 @@ "selectedTokenSets": { "NLdoc/Ridderkerk": "enabled" }, - "group": "NLdoc" + "group": "NLdoc", + "$figmaVariableReferences": {} }, { "id": "636f384651b16ba46aca2cc94d071476e0d716b2", @@ -1015,7 +1018,8 @@ "selectedTokenSets": { "NLdoc/Waterschap Hollandse Delta": "enabled" }, - "group": "NLdoc" + "group": "NLdoc", + "$figmaVariableReferences": {} }, { "id": "457e23ac6f8506672b0bcefbc480a7f3b6d30e2b", diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json index 2c1c03b6..3421d8e1 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json @@ -160,13 +160,5 @@ } } } - }, - "figma": { - "textbox": { - "block-size": { - "value": "{utrecht.textbox.line-height} + {utrecht.textbox.padding-block-start} + {utrecht.textbox.padding-block-end}", - "type": "sizing" - } - } } } \ No newline at end of file diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json index 314f863d..ef8da068 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json @@ -148,6 +148,10 @@ "font-size": { "value": "{lux.font-size.body.default}", "type": "fontSizes" + }, + "min-block-size": { + "value": "{lux.size.target}", + "type": "sizing" } } }, @@ -158,11 +162,6 @@ "value": "4 * {utrecht.textarea.line-height}", "type": "sizing", "description": "4 * lineheight " - }, - "block-size-2": { - "value": "4 * {utrecht.textarea.line-height} + {utrecht.textarea.padding-block-start} + {utrecht.textarea.padding-block-end}", - "type": "sizing", - "description": "4 * lineheight " } }, "8-rows": { @@ -170,11 +169,6 @@ "value": "8 * {utrecht.textarea.line-height}", "type": "sizing", "description": "4 * lineheight " - }, - "block-size-2": { - "value": "8 * {utrecht.textarea.line-height} + {utrecht.textarea.padding-block-start} + {utrecht.textarea.padding-block-end}", - "type": "sizing", - "description": "4 * lineheight " } } } From 7b30d7b68aebce45a9dd2aef721224e24a119921 Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:13:42 +0100 Subject: [PATCH 4/5] push? From 9cfd9a63ac8d183712ead851e719178dceef810e Mon Sep 17 00:00:00 2001 From: AlineNap <59806622+AlineNap@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:12:20 +0100 Subject: [PATCH 5/5] update --- proprietary/design-tokens/src/imported/nl/utrecht-textarea.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json index ef8da068..7f414381 100644 --- a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json +++ b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json @@ -2,7 +2,7 @@ "utrecht": { "textarea": { "max-inline-size": { - "value": "400px", + "value": "25rem", "type": "sizing" }, "padding-block-end": {