From e9fc820dcfb724031d2ccabefd75f219b714d512 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Thu, 29 Feb 2024 10:55:03 +0100 Subject: [PATCH 1/3] Add missing tokens for offset of link on header logo --- packages/css/src/components/header/header.scss | 2 +- proprietary/tokens/src/components/amsterdam/header.tokens.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/css/src/components/header/header.scss b/packages/css/src/components/header/header.scss index b09ead4f19..ca42e443d8 100644 --- a/packages/css/src/components/header/header.scss +++ b/packages/css/src/components/header/header.scss @@ -20,7 +20,7 @@ .amsterdam-header__logo { flex: none; - outline-offset: var(--amsterdam-link-outline-offset); + outline-offset: var(--amsterdam-header-logo-outline-offset); } .amsterdam-header__links { diff --git a/proprietary/tokens/src/components/amsterdam/header.tokens.json b/proprietary/tokens/src/components/amsterdam/header.tokens.json index 7c4d4bfac9..33c531b8cb 100644 --- a/proprietary/tokens/src/components/amsterdam/header.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/header.tokens.json @@ -4,6 +4,9 @@ "column-gap": { "value": "{amsterdam.space.md}", "comment": "Must have the same value as `amsterdam.grid.column-gap`." + }, + "logo": { + "outline-offset": { "value": "{amsterdam.focus.outline-offset}" } } } } From 645bf0d2eb2a052785e9950da1e94e203153e716 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Thu, 7 Mar 2024 13:49:02 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Rename=20=E2=80=98header=20logo=E2=80=99=20?= =?UTF-8?q?to=20=E2=80=98header=20logo=20link=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/css/src/components/header/header.scss | 4 ++-- packages/react/src/Header/Header.tsx | 2 +- .../tokens/src/components/amsterdam/header.tokens.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/css/src/components/header/header.scss b/packages/css/src/components/header/header.scss index ca42e443d8..fefc38755e 100644 --- a/packages/css/src/components/header/header.scss +++ b/packages/css/src/components/header/header.scss @@ -18,9 +18,9 @@ } } -.amsterdam-header__logo { +.amsterdam-header__logo-link { flex: none; - outline-offset: var(--amsterdam-header-logo-outline-offset); + outline-offset: var(--amsterdam-header-logo-link-outline-offset); } .amsterdam-header__links { diff --git a/packages/react/src/Header/Header.tsx b/packages/react/src/Header/Header.tsx index 7b740984a5..ac44555b0e 100644 --- a/packages/react/src/Header/Header.tsx +++ b/packages/react/src/Header/Header.tsx @@ -37,7 +37,7 @@ export const Header = forwardRef( return ( <>
- + {logoLinkTitle} diff --git a/proprietary/tokens/src/components/amsterdam/header.tokens.json b/proprietary/tokens/src/components/amsterdam/header.tokens.json index 33c531b8cb..5954b90e7c 100644 --- a/proprietary/tokens/src/components/amsterdam/header.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/header.tokens.json @@ -5,7 +5,7 @@ "value": "{amsterdam.space.md}", "comment": "Must have the same value as `amsterdam.grid.column-gap`." }, - "logo": { + "logo-link": { "outline-offset": { "value": "{amsterdam.focus.outline-offset}" } } } From 9a37fa14098a6f876ffc7bbdca59730b8efeeb4f Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Thu, 7 Mar 2024 17:15:46 +0100 Subject: [PATCH 3/3] Fix token hierarchy --- .../tokens/src/components/amsterdam/header.tokens.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proprietary/tokens/src/components/amsterdam/header.tokens.json b/proprietary/tokens/src/components/amsterdam/header.tokens.json index 2ab53e0fd2..aa6fe58c38 100644 --- a/proprietary/tokens/src/components/amsterdam/header.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/header.tokens.json @@ -5,9 +5,9 @@ "value": "{amsterdam.space.md}", "comment": "Must have the same value as `amsterdam.grid.column-gap`." }, + "padding-block": { "value": "{amsterdam.space.inside.md}" }, "logo-link": { - "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, - "padding-block": { "value": "{amsterdam.space.inside.md}" } + "outline-offset": { "value": "{amsterdam.focus.outline-offset}" } } } }