Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Små endringer i DashboardHeader #495

Merged
merged 3 commits into from
Oct 19, 2021
Merged

Små endringer i DashboardHeader #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
107842a
Align header items
magnusrand Oct 19, 2021
78828ba
Make clicking logo redirect to landing page, like with Entur logo
magnusrand Oct 19, 2021
e05d174
Remove duplicate code
magnusrand Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/Header/DashboardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)

Expand Down
1 change: 1 addition & 0 deletions src/components/Header/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down