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

Reduce use of category color on category page #204

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Reduce use of category color on category page #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions components/contentblocks/ActionListBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const GET_ACTION_LIST_FOR_BLOCK = gql`
`;

const ActionListSection = styled.div`
background-color: ${(props) => props.color};
padding: ${(props) => props.theme.spaces.s400} 0};
background-color: ${(props) => props.theme.neutralLight};
padding: ${(props) => props.theme.spaces.s400} 0;
`;

const SectionHeader = styled.h2`
Expand Down Expand Up @@ -61,7 +61,7 @@ const ActionListBlock = (props) => {

const heading = t('actions', getActionTermContext(plan));
return (
<ActionListSection id={id} color={color}>
<ActionListSection id={id}>
<Container>
{heading && <SectionHeader>{heading}</SectionHeader>}
<ActionCardList actions={planActions} groupBy={groupBy} />
Expand Down
41 changes: 25 additions & 16 deletions components/contentblocks/CategoryPageHeaderBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,41 +45,50 @@ enum IconSize {
L = 'L',
}

const CategoryHeader = styled.div`
const CategoryHeader = styled.div<{
$bg?: string;
$hasImage?: boolean;
}>`
width: 100%;
position: relative;
background-color: ${(props) => (props.bg ? props.bg : props.theme.brandDark)};
background-color: ${(props) =>
props.$bg ? props.$bg : props.theme.neutralLight};
padding: 0 0 2rem;

@media (min-width: ${(props) => props.theme.breakpointMd}) {
display: flex;
align-items: flex-start;
min-height: ${(props) => (props.hasImage ? '32rem' : '0')};
min-height: ${(props) => (props.$hasImage ? '32rem' : '0')};
padding: 0;
}

@media (min-width: ${(props) => props.theme.breakpointLg}) {
${(props) => (props.hasImage ? '28rem' : '0')};
${(props) => (props.$hasImage ? '28rem' : '0')};
}

@media (min-width: ${(props) => props.theme.breakpointXl}) {
${(props) => (props.hasImage ? '30rem' : '0')};
${(props) => (props.$hasImage ? '30rem' : '0')};
}
`;

const CategoryHeaderImage = styled.div`
min-height: ${(props) => (props.image ? '14rem' : '0')};
const CategoryHeaderImage = styled.div<{
$bg?: string;
$image?: string;
$imageAlign?: string;
}>`
min-height: ${(props) => (props.$image ? '14rem' : '0')};
margin: 0 -1rem;
background-size: cover;
background-color: ${(props) => (props.bg ? props.bg : props.theme.branddark)};
background-position: ${(props) => props.imageAlign};
background-image: url(${(props) => props.image});
background-color: ${(props) =>
props.$bg ? props.$bg : props.theme.brandDark};
background-position: ${(props) => props.$imageAlign};
background-image: url(${(props) => props.$image});
background-repeat: no-repeat;

@media (min-width: ${(props) => props.theme.breakpointMd}) {
position: absolute;
width: 100%;
min-height: ${(props) => (props.image ? '32rem' : '0')};
min-height: ${(props) => (props.$image ? '32rem' : '0')};
margin: 0;
}
`;
Expand Down Expand Up @@ -144,7 +153,7 @@ const HeaderContent = styled.div<{

@media (min-width: ${(props) => props.theme.breakpointMd}) {
margin-top: ${({ hasImage }) => (hasImage ? '14rem' : '3rem')};
margin-bottom: ${({ hasImage }) => (hasImage ? '3rem' : undefined)};
margin-bottom: 3rem;

h1 {
font-size: ${(props) => props.theme.fontSizeXl};
Expand Down Expand Up @@ -313,11 +322,11 @@ function CategoryPageHeaderBlock({
};

return (
<CategoryHeader bg={color} hasImage={!!headerImage}>
<CategoryHeader $bg={color} $hasImage={!!headerImage}>
<CategoryHeaderImage
bg={color}
imageAlign={imageAlign}
image={headerImage?.large?.src}
$bg={color}
$imageAlign={imageAlign}
$image={headerImage?.large?.src}
/>
<Container className="header-container">
<Row>
Expand Down
Loading