From 107842ad1c57c59edc68c4b6076f9f136c406b25 Mon Sep 17 00:00:00 2001 From: Magnus Rand Date: Tue, 19 Oct 2021 16:20:47 +0200 Subject: [PATCH 1/3] Align header items --- src/components/Header/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Header/styles.scss b/src/components/Header/styles.scss index 7b7bd4048..1bc7abc97 100644 --- a/src/components/Header/styles.scss +++ b/src/components/Header/styles.scss @@ -5,6 +5,7 @@ display: flex; flex-direction: row; justify-content: space-between; + align-items: baseline; margin: 0 4rem 1rem 4rem; padding-top: 2rem; overflow: hidden; From 78828ba8c98705a6eb753becd14ce2c5fd7e85a6 Mon Sep 17 00:00:00 2001 From: Magnus Rand Date: Tue, 19 Oct 2021 16:21:43 +0200 Subject: [PATCH 2/3] Make clicking logo redirect to landing page, like with Entur logo --- src/components/Header/DashboardHeader.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Header/DashboardHeader.tsx b/src/components/Header/DashboardHeader.tsx index b7e417c6e..6d1c20072 100644 --- a/src/components/Header/DashboardHeader.tsx +++ b/src/components/Header/DashboardHeader.tsx @@ -14,7 +14,9 @@ export function DashboardHeader(): JSX.Element | null { const { logo, logoSize, description } = settings const headerLogo = logo ? ( - + + + ) : ( From e05d174c9f8d595dce771b69701fa50d7e3ad07a Mon Sep 17 00:00:00 2001 From: Magnus Rand Date: Tue, 19 Oct 2021 16:37:24 +0200 Subject: [PATCH 3/3] Remove duplicate code --- src/components/Header/DashboardHeader.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Header/DashboardHeader.tsx b/src/components/Header/DashboardHeader.tsx index 6d1c20072..f18ea76fd 100644 --- a/src/components/Header/DashboardHeader.tsx +++ b/src/components/Header/DashboardHeader.tsx @@ -13,13 +13,13 @@ export function DashboardHeader(): JSX.Element | null { if (!settings) return null const { logo, logoSize, description } = settings - const headerLogo = logo ? ( + const headerLogo = ( - - - ) : ( - - + {logo ? ( + + ) : ( + + )} )