From 0c8d66258227820af88f0c39c2e0f6b1481f9aea Mon Sep 17 00:00:00 2001 From: Martin Stievenart Date: Tue, 16 Jan 2024 14:51:08 +0100 Subject: [PATCH 1/4] fix(header): increase logo size --- packages/Layout/header/src/Logo/logo.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Layout/header/src/Logo/logo.scss b/packages/Layout/header/src/Logo/logo.scss index 24b2032b2..04cc74c84 100644 --- a/packages/Layout/header/src/Logo/logo.scss +++ b/packages/Layout/header/src/Logo/logo.scss @@ -1,6 +1,6 @@ @import '@axa-fr/react-toolkit-core/src/common/scss/core.scss'; -$logo-size: 33px; +$logo-size: 55px; $switch-size: 14px; .af-logo { From 67c54f26d546f8a330037dfad4484b4185aaa2d6 Mon Sep 17 00:00:00 2001 From: Martin Stievenart Date: Tue, 16 Jan 2024 14:52:55 +0100 Subject: [PATCH 2/4] fix(header): delete or reduce header's margin and padding --- packages/Layout/header/src/Header/header.scss | 2 +- packages/Layout/header/src/Name/name.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/Layout/header/src/Header/header.scss b/packages/Layout/header/src/Header/header.scss index 31d08af1a..bebd15f15 100644 --- a/packages/Layout/header/src/Header/header.scss +++ b/packages/Layout/header/src/Header/header.scss @@ -2,7 +2,7 @@ .af-header { &__content { - padding-bottom: 2rem; + padding-bottom: 1.75rem; display: flex; justify-content: space-between; align-items: center; diff --git a/packages/Layout/header/src/Name/name.scss b/packages/Layout/header/src/Name/name.scss index 6bd422f52..bf615b615 100644 --- a/packages/Layout/header/src/Name/name.scss +++ b/packages/Layout/header/src/Name/name.scss @@ -17,7 +17,6 @@ &__name { order: 1; - margin-bottom: 1rem; align-self: flex-start; flex-basis: 60%; display: table; From 77bfcae3c1eff518f422f65e73edb7187377fbad Mon Sep 17 00:00:00 2001 From: Martin Stievenart Date: Tue, 16 Jan 2024 14:53:39 +0100 Subject: [PATCH 3/4] fix(header): reduce title bar font-size --- packages/Layout/header/src/Title/title-bar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Layout/header/src/Title/title-bar.scss b/packages/Layout/header/src/Title/title-bar.scss index c195b2dec..ae5c200b2 100644 --- a/packages/Layout/header/src/Title/title-bar.scss +++ b/packages/Layout/header/src/Title/title-bar.scss @@ -107,7 +107,7 @@ } &__title { - font-size: 1.375rem; + font-size: 1.25rem; } } } From f9499a2ad39e177b15c94202c520899d7f28fc4d Mon Sep 17 00:00:00 2001 From: Martin Stievenart Date: Tue, 16 Jan 2024 14:54:41 +0100 Subject: [PATCH 4/4] fix(header): subtitle with same size as title --- packages/Layout/header/src/Title/Title.tsx | 4 +--- .../src/__tests__/__snapshots__/Title.spec.tsx.snap | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/Layout/header/src/Title/Title.tsx b/packages/Layout/header/src/Title/Title.tsx index c7c5411d3..2da8a1318 100644 --- a/packages/Layout/header/src/Title/Title.tsx +++ b/packages/Layout/header/src/Title/Title.tsx @@ -45,9 +45,7 @@ const Title = ({

{title} {subtitle && ( - - {subtitle} - + {subtitle} )}

{children} diff --git a/packages/Layout/header/src/__tests__/__snapshots__/Title.spec.tsx.snap b/packages/Layout/header/src/__tests__/__snapshots__/Title.spec.tsx.snap index b3427fc32..7021a6fb6 100644 --- a/packages/Layout/header/src/__tests__/__snapshots__/Title.spec.tsx.snap +++ b/packages/Layout/header/src/__tests__/__snapshots__/Title.spec.tsx.snap @@ -30,11 +30,11 @@ exports[` renders Title correctly 1`] = ` class="af-title-bar__title" > Toolkit Axa - <small + <span class="af-title-bar__subtitle" > Info complémentaire - </small> + </span> </h1> </div> </div> @@ -53,11 +53,11 @@ exports[`<Title> renders Title correctly without menu 1`] = ` class="af-title-bar__title" > Toolkit Axa - <small + <span class="af-title-bar__subtitle" > Info complémentaire - </small> + </span> </h1> </div> </div>