From 1b5b7be45c9955e26696ca3060ba3141f6d8748d Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Thu, 2 May 2024 15:47:32 +0200 Subject: [PATCH 1/3] :lipstick: [#2420] Added and refactored heading tokens --- src/brand/openinwoner/typography.tokens.json | 2 +- src/community/utrecht/heading-1.tokens.json | 2 +- src/community/utrecht/heading-2.tokens.json | 2 +- src/community/utrecht/heading-3.tokens.json | 2 +- src/community/utrecht/heading-4.tokens.json | 13 +++++++++++++ src/community/utrecht/typography.tokens.json | 10 ++++++++++ src/components/headings/heading.tokens.json | 14 ++++++-------- 7 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 src/community/utrecht/heading-4.tokens.json create mode 100644 src/community/utrecht/typography.tokens.json diff --git a/src/brand/openinwoner/typography.tokens.json b/src/brand/openinwoner/typography.tokens.json index f149dff..5806f10 100644 --- a/src/brand/openinwoner/typography.tokens.json +++ b/src/brand/openinwoner/typography.tokens.json @@ -16,7 +16,7 @@ }, "typography": { "sans-serif": { - "font-family": {"value": "TheSans C5, sans-serif"} + "font-family": {"value": "Body"} }, "heading": { "font-family": {"value": "Heading"}, diff --git a/src/community/utrecht/heading-1.tokens.json b/src/community/utrecht/heading-1.tokens.json index fd9f792..7ae7e4c 100644 --- a/src/community/utrecht/heading-1.tokens.json +++ b/src/community/utrecht/heading-1.tokens.json @@ -2,7 +2,7 @@ "utrecht": { "heading-1": { "color": {"value": "{oip.color.fg-heading}"}, - "font-family": {"value": "Heading"}, + "font-family": {"value": "{oip.typography.heading.font-family}"}, "font-size": {"value": "32px"}, "font-weight": {"value": "bold"}, "line-height": {"value": "41px"}, diff --git a/src/community/utrecht/heading-2.tokens.json b/src/community/utrecht/heading-2.tokens.json index 66dd9bb..b6a5daf 100644 --- a/src/community/utrecht/heading-2.tokens.json +++ b/src/community/utrecht/heading-2.tokens.json @@ -2,7 +2,7 @@ "utrecht": { "heading-2": { "color": {"value": "{oip.color.fg-heading}"}, - "font-family": {"value": "Heading"}, + "font-family": {"value": "{oip.typography.heading.font-family}"}, "font-size": {"value": "24px"}, "font-weight": {"value": "bold"}, "letter-spacing": {"value": "normal"}, diff --git a/src/community/utrecht/heading-3.tokens.json b/src/community/utrecht/heading-3.tokens.json index f3ca094..0b79f03 100644 --- a/src/community/utrecht/heading-3.tokens.json +++ b/src/community/utrecht/heading-3.tokens.json @@ -2,7 +2,7 @@ "utrecht": { "heading-3": { "color": {"value": "{oip.color.fg-heading}"}, - "font-family": {"value": "Heading"}, + "font-family": {"value": "{oip.typography.heading.font-family}"}, "font-size": {"value": "20px"}, "font-weight": {"value": "bold"}, "line-height": {"value": "30px"}, diff --git a/src/community/utrecht/heading-4.tokens.json b/src/community/utrecht/heading-4.tokens.json new file mode 100644 index 0000000..18f875d --- /dev/null +++ b/src/community/utrecht/heading-4.tokens.json @@ -0,0 +1,13 @@ +{ + "utrecht": { + "heading-4": { + "color": {"value": "{oip.color.fg-heading}"}, + "font-family": {"value": "{oip.typography.heading.font-family}"}, + "font-size": {"value": "16px"}, + "font-weight": {"value": "bold"}, + "line-height": {"value": "26px"}, + "margin-block-end": {"value": "0"}, + "margin-block-start": {"value": "0"} + } + } +} diff --git a/src/community/utrecht/typography.tokens.json b/src/community/utrecht/typography.tokens.json new file mode 100644 index 0000000..3d394dc --- /dev/null +++ b/src/community/utrecht/typography.tokens.json @@ -0,0 +1,10 @@ +{ + "utrecht": { + "document": { + "font-family": { + "value": "{oip.typography.sans-serif.font-family}", + "comment": "The body font-style for the theme." + } + } + } +} diff --git a/src/components/headings/heading.tokens.json b/src/components/headings/heading.tokens.json index cd701da..5afbf1a 100644 --- a/src/components/headings/heading.tokens.json +++ b/src/components/headings/heading.tokens.json @@ -1,13 +1,11 @@ { "oip": { - "heading-4": { - "color": {"value": "{oip.color.fg-heading}"}, - "font-family": {"value": "{oip.typography.heading.font-family}"}, - "font-size": {"value": "16px"}, - "font-weight": {"value": "700"}, - "line-height": {"value": "26px"}, - "margin-block-end": {"value": "0"}, - "margin-block-start": {"value": "0"} + "heading-2": { + "display": { + "value": "{oip.typography.heading.display}", + "comment": "The flexbox style for headings that contain a button or indicator." + }, + "justify-content": {"value": "{oip.typography.heading.justify-content}"} } } } From 6165bf15835d6c7c9e2b69e53d4186b5002affc6 Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Mon, 6 May 2024 16:40:57 +0200 Subject: [PATCH 2/3] :lipstick: [#2420] Bump version for branch publishing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80433d9..f626c80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@open-inwoner/design-tokens", - "version": "0.0.1", + "version": "0.0.2-alpha.0", "description": "Design tokens for Open Inwoner", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From c2dbb2079c190d4bb157443c68ed87cdc9e1cbb1 Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Mon, 6 May 2024 17:30:12 +0200 Subject: [PATCH 3/3] :bookmark: [#2420] Bump version for patch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f626c80..4e88c57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@open-inwoner/design-tokens", - "version": "0.0.2-alpha.0", + "version": "0.0.3-alpha.0", "description": "Design tokens for Open Inwoner", "scripts": { "test": "echo \"Error: no test specified\" && exit 1",