Merge pull request #495 from entur/fix/small-dashboard-header-fixes

Små endringer i DashboardHeader
entur · Oct 19, 2021 · 6bb7106 · 6bb7106
2 parents 9fdacad + e05d174
commit 6bb7106
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/Header/DashboardHeader.tsx b/src/components/Header/DashboardHeader.tsx
@@ -13,11 +13,13 @@ export function DashboardHeader(): JSX.Element | null {
     if (!settings) return null
     const { logo, logoSize, description } = settings
 
-    const headerLogo = logo ? (
-        <img src={logo} height={logoSize} />
-    ) : (
+    const headerLogo = (
         <Link to="/">
-            <TavlaLogo className="header__logo-wrapper__logo" />
+            {logo ? (
+                <img src={logo} height={logoSize} />
+            ) : (
+                <TavlaLogo className="header__logo-wrapper__logo" />
+            )}
         </Link>
     )
 

diff --git 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;