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.

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

Add link to Methodology page to the header #6332

Merged
merged 4 commits into from
Jan 11, 2024
Merged
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions web/src/features/header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ function MenuLink({
onClick && onClick();
};
return (
<div className="relative flex py-2 ">
<div className="relative flex py-2">
<NavigationMenu.Item
asChild
className="cursor-pointer rounded-md transition-colors hover:bg-zinc-100 dark:hover:bg-black/50"
>
<NavigationMenu.Link
onClick={handleClick}
href={href}
className="group px-2 py-2"
className="group px-1 py-2 text-base lg:px-2 lg:text-[1rem]"
>
{children}
{isExternal && (
Expand All @@ -59,16 +59,23 @@ export default function Header(): JSX.Element {
return (
<header
className={twMerge(
'z-30 hidden w-full items-center justify-between bg-white pl-4 pr-8 shadow-[0_4px_6px_-2px_rgba(0,0,0,0.1)] dark:bg-gray-800 dark:shadow-[0_4px_6px_-2px_rgba(0,0,0,0.25)]',
!isMobileApp && 'sm:flex'
'z-30 hidden w-full items-center justify-between bg-white px-4 shadow-[0_4px_6px_-2px_rgba(0,0,0,0.1)] md:pr-8 dark:bg-gray-800 dark:shadow-[0_4px_6px_-2px_rgba(0,0,0,0.25)]',
!isMobileApp && 'sm:block md:flex'
)}
>
<Logo className="h-12 w-56 fill-black dark:fill-white" />
<NavigationMenu.Root className="hidden md:block">
<NavigationMenu.List className="flex space-x-2">
<NavigationMenu.Root className="hidden sm:block">
<NavigationMenu.List className="flex w-full justify-around md:space-x-2">
<MenuLink id="faq" onClick={onFAQClick}>
FAQ
</MenuLink>
<MenuLink
href="https://www.electricitymaps.com/methodology/?utm_source=app.electricitymaps.com&utm_medium=referral"
id="methodology"
isExternal
>
Methodology
</MenuLink>
<MenuLink
href="https://www.electricitymaps.com/jobs/?utm_source=app.electricitymaps.com&utm_medium=referral"
id="jobs"
VIKTORVAV99 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading