Skip to content

style(GlobalHeader): Use theme variable for header height #1469

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

Merged
github-actions merged 2 commits into from
Mar 5, 2021
Merged

style(GlobalHeader): Use theme variable for header height #1469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5177774
Use theme var for header height
codecaaron Mar 5, 2021
bf16782
Merge branch 'main' into ar-use-header-var
codecaaron Mar 5, 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
45 changes: 26 additions & 19 deletions packages/gamut-labs/src/experimental/GlobalHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box } from '@codecademy/gamut';
import { useTheme } from '@emotion/react';
import React from 'react';

import { AppHeader } from '../AppHeader';
Expand Down Expand Up @@ -93,22 +94,28 @@ const getMobileAppHeaderItems = (
}
};

export const GlobalHeader: React.FC<GlobalHeaderProps> = (props) => (
<>
<Box display={{ base: 'none', md: 'block' }} height="80">
<AppHeader action={props.action} items={getAppHeaderItems(props)} />
</Box>
<Box
display={{ base: 'block', md: 'none' }}
height="64"
position="relative"
zIndex={0}
>
<AppHeaderMobile
action={props.action}
items={getMobileAppHeaderItems(props)}
renderSearch={props.renderSearch?.mobile}
/>
</Box>
</>
);
export const GlobalHeader: React.FC<GlobalHeaderProps> = (props) => {
const theme = useTheme();
return (
<>
<Box
display={{ base: 'none', md: 'block' }}
height={theme.elements.headerHeight}
Copy link
Contributor

@saghdaey saghdaey Mar 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wowowow!! wait did @katiezutter know you were working on this

Copy link
Contributor

@katiezutter katiezutter Mar 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱

>
<AppHeader action={props.action} items={getAppHeaderItems(props)} />
</Box>
<Box
display={{ base: 'block', md: 'none' }}
height={theme.elements.headerHeight}
position="relative"
zIndex={0}
>
<AppHeaderMobile
action={props.action}
items={getMobileAppHeaderItems(props)}
renderSearch={props.renderSearch?.mobile}
/>
</Box>
</>
);
};