From db4cfcc459a62405ae3eb200c20328cb87bf83b5 Mon Sep 17 00:00:00 2001 From: ulricden <82812998+ulricden@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:34:58 +0100 Subject: [PATCH 1/4] Label font token added. --- tokens.json | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/tokens.json b/tokens.json index b1c3125..b111ee6 100644 --- a/tokens.json +++ b/tokens.json @@ -443,7 +443,7 @@ "type": "typography" } }, - "label": { + "caption": { "n1": { "value": { "fontWeight": "{font-weight.regular}", @@ -500,6 +500,35 @@ "noto-sans": { "value": "Noto Sans", "type": "fontFamilies" + }, + "Label": { + "n1": { + "value": { + "fontSize": "{font-size.s}", + "fontWeight": "{font-weight.bold}", + "fontFamily": "{public-sans}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" + }, + "n2": { + "value": { + "fontSize": "{font-size.s}", + "fontFamily": "{public-sans}", + "fontWeight": "{font-weight.semi-bold}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" + }, + "n3": { + "value": { + "fontFamily": "{public-sans}", + "fontWeight": "{font-weight.bold}", + "fontSize": "{font-size.xs}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" + } } }, "$themes": [ @@ -557,11 +586,11 @@ "body.n2": "S:f8bc9590028979caaa6fd2ce46c54ccf3120e262,", "body.n3": "S:c6ef08774eddeafd85209ccc83fce05ec477e800,", "body.n4": "S:6a0c6aa80896c8431107b2d1c2c3a96d55891f3e,", - "label.n1": "S:c4bbc51b20bd8bd77a36dd78cd658e36bf870f1e,", - "label.n2": "S:6b508ea6886256adeaced29b17f5ce4c7f97e258,", "button.n1": "S:4058fe4383cf9337094c1cc75e891c647c577ce4,", "button.n2": "S:55ffa5e6d5cb7b63def7059c1188a516837df978,", - "button.n3": "S:2b15f8969b2a7895f51224d8557331a897f68c05," + "button.n3": "S:2b15f8969b2a7895f51224d8557331a897f68c05,", + "caption.n1": "S:c4bbc51b20bd8bd77a36dd78cd658e36bf870f1e,", + "caption.n2": "S:6b508ea6886256adeaced29b17f5ce4c7f97e258," }, "selectedTokenSets": { "global": "enabled" From c55433b7a4eec95dc06336ee6b4ff807427a5d3c Mon Sep 17 00:00:00 2001 From: ulricden <82812998+ulricden@users.noreply.github.com> Date: Tue, 19 Mar 2024 09:55:06 +0100 Subject: [PATCH 2/4] Dev - "caption" typography token (previously "label") is renamed "label" UI testing: - "button/m" composition token has been added for design exploration --- tokens.json | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/tokens.json b/tokens.json index b111ee6..e636a78 100644 --- a/tokens.json +++ b/tokens.json @@ -443,7 +443,7 @@ "type": "typography" } }, - "caption": { + "label": { "n1": { "value": { "fontWeight": "{font-weight.regular}", @@ -491,6 +491,14 @@ }, "type": "typography", "description": "Global: Button (S), Label (S)" + }, + "m": { + "value": { + "height": "48px", + "typography": "{button.n1}", + "borderRadius": "{border-radius.m}" + }, + "type": "composition" } }, "public-sans": { @@ -500,35 +508,6 @@ "noto-sans": { "value": "Noto Sans", "type": "fontFamilies" - }, - "Label": { - "n1": { - "value": { - "fontSize": "{font-size.s}", - "fontWeight": "{font-weight.bold}", - "fontFamily": "{public-sans}", - "lineHeight": "{line-height.loose}" - }, - "type": "typography" - }, - "n2": { - "value": { - "fontSize": "{font-size.s}", - "fontFamily": "{public-sans}", - "fontWeight": "{font-weight.semi-bold}", - "lineHeight": "{line-height.loose}" - }, - "type": "typography" - }, - "n3": { - "value": { - "fontFamily": "{public-sans}", - "fontWeight": "{font-weight.bold}", - "fontSize": "{font-size.xs}", - "lineHeight": "{line-height.loose}" - }, - "type": "typography" - } } }, "$themes": [ @@ -589,8 +568,8 @@ "button.n1": "S:4058fe4383cf9337094c1cc75e891c647c577ce4,", "button.n2": "S:55ffa5e6d5cb7b63def7059c1188a516837df978,", "button.n3": "S:2b15f8969b2a7895f51224d8557331a897f68c05,", - "caption.n1": "S:c4bbc51b20bd8bd77a36dd78cd658e36bf870f1e,", - "caption.n2": "S:6b508ea6886256adeaced29b17f5ce4c7f97e258," + "label.n1": "S:c4bbc51b20bd8bd77a36dd78cd658e36bf870f1e,", + "label.n2": "S:6b508ea6886256adeaced29b17f5ce4c7f97e258," }, "selectedTokenSets": { "global": "enabled" From 44698c4a0d562873df675134dd3ee4182744f15d Mon Sep 17 00:00:00 2001 From: ulricden <82812998+ulricden@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:33:23 +0100 Subject: [PATCH 3/4] creation of sizing tokens: height.m - 48px height.s - 38px --- tokens.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tokens.json b/tokens.json index e636a78..18f1208 100644 --- a/tokens.json +++ b/tokens.json @@ -508,6 +508,16 @@ "noto-sans": { "value": "Noto Sans", "type": "fontFamilies" + }, + "height": { + "m": { + "value": "48", + "type": "sizing" + }, + "s": { + "value": "38", + "type": "sizing" + } } }, "$themes": [ From f1bc455ea1fe63810d932098c6ddbee8713c1840 Mon Sep 17 00:00:00 2001 From: ulricden <82812998+ulricden@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:45:02 +0200 Subject: [PATCH 4/4] Update of Typography tokens structure: "Caption token" -> "Label" tokenn --- tokens.json | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/tokens.json b/tokens.json index 18f1208..d391f06 100644 --- a/tokens.json +++ b/tokens.json @@ -491,14 +491,6 @@ }, "type": "typography", "description": "Global: Button (S), Label (S)" - }, - "m": { - "value": { - "height": "48px", - "typography": "{button.n1}", - "borderRadius": "{border-radius.m}" - }, - "type": "composition" } }, "public-sans": { @@ -509,14 +501,33 @@ "value": "Noto Sans", "type": "fontFamilies" }, - "height": { - "m": { - "value": "48", - "type": "sizing" + "tag": { + "n1": { + "value": { + "fontSize": "{font-size.s}", + "fontWeight": "{font-weight.bold}", + "fontFamily": "{public-sans}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" }, - "s": { - "value": "38", - "type": "sizing" + "n2": { + "value": { + "fontSize": "{font-size.s}", + "fontFamily": "{public-sans}", + "fontWeight": "{font-weight.semi-bold}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" + }, + "n3": { + "value": { + "fontFamily": "{public-sans}", + "fontWeight": "{font-weight.bold}", + "fontSize": "{font-size.xs}", + "lineHeight": "{line-height.loose}" + }, + "type": "typography" } } },