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

feat(web): Change default header styles for organizations #16218

Merged
merged 2 commits into from
Sep 30, 2024
Merged

feat(web): Change default header styles for organizations #16218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01985b7
Change default header styles for organizations
mannipje Sep 30, 2024
85d7b0a
Merge branch 'main' into feature/change-default-header-styles-for-org…
kodiakhq[bot] Sep 30, 2024
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
80 changes: 76 additions & 4 deletions apps/web/components/Organization/Wrapper/OrganizationWrapper.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ export const sakHeaderGridContainer = style({
}),
})

export const sakHeaderGridContainerSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})

export const landlaeknirHeaderGridContainer = style({
display: 'grid',
maxWidth: '1342px',
Expand All @@ -46,6 +58,18 @@ export const landlaeknirHeaderGridContainer = style({
}),
})

export const landlaeknirHeaderGridContainerSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})

export const shhHeaderGridContainerBase = style({
display: 'grid',
maxWidth: '1342px',
Expand All @@ -69,7 +93,17 @@ export const shhHeaderGridContainerWidth = style([
}),
])

export const shhHeaderGridContainerWidthSubpage = shhHeaderGridContainerBase
export const shhHeaderGridContainerWidthSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})

export const rikissaksoknariHeaderGridContainerBase = style({
display: 'grid',
Expand Down Expand Up @@ -102,8 +136,23 @@ export const rikissaksoknariHeaderGridContainerWidth = style([
}),
])

export const rikissaksoknariHeaderGridContainerSubpage =
rikissaksoknariHeaderGridContainerBase
export const rikissaksoknariHeaderGridContainerSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
backgroundBlendMode: 'saturation',
backgroundRepeat: 'no-repeat',
background: `
linear-gradient(180deg, #000000 0%, rgba(0, 0, 0, 0) 92.19%),
linear-gradient(-93.41deg, rgba(0, 72, 153, 0.4) -4.61%, rgba(0, 72, 153, 0.62) 17.93%, rgba(0, 72, 153, 0.82) 47.83%, rgba(0, 72, 153, 0.94) 71.31%, rgba(0, 72, 153, 0.95) 94.11%, #004899 114.58%)
`,
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})

export const hsaHeaderGridContainerBase = style({
display: 'grid',
Expand All @@ -117,7 +166,17 @@ export const hsaHeaderGridContainerBase = style({
}),
})

export const hsaHeaderGridContainerWidthSubpage = hsaHeaderGridContainerBase
export const hsaHeaderGridContainerWidthSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})

export const hsaHeaderGridContainerWidth = style([
hsaHeaderGridContainerBase,
Expand Down Expand Up @@ -180,3 +239,16 @@ export const hveHeaderGridContainer = style({
},
}),
})

export const hveHeaderGridContainerSubpage = style({
display: 'grid',
maxWidth: '1342px',
margin: '0 auto',
borderBottom: '8px solid #F01E28',
...themeUtils.responsiveStyle({
lg: {
gridTemplateRows: 'auto',
gridTemplateColumns: '100fr',
},
}),
})
18 changes: 15 additions & 3 deletions apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,11 @@ export const OrganizationHeader: React.FC<
'landlaeknirHeaderImage',
'https://images.ctfassets.net/8k0h54kbe6bj/2p6UWMBdVkVHBAjsnX20bY/c04b402332dbae96c198db7b8640f20b/Header_illustration_1.svg',
)}
className={styles.landlaeknirHeaderGridContainer}
className={
isSubpage
? styles.landlaeknirHeaderGridContainerSubpage
: styles.landlaeknirHeaderGridContainer
}
/>
) : (
<LandlaeknirHeader
Expand Down Expand Up @@ -416,7 +420,11 @@ export const OrganizationHeader: React.FC<
return n('usingDefaultHeader', false) ? (
<DefaultHeader
{...defaultProps}
className={styles.sakHeaderGridContainer}
className={
isSubpage
? styles.sakHeaderGridContainerSubpage
: styles.sakHeaderGridContainer
}
image={n(
`sakHeaderBgImage`,
'https://images.ctfassets.net/8k0h54kbe6bj/4SjqwRBZRMWVWG0y73sXxq/cf8d0d16704cfea124362eca03afdb41/sak-header-trans_2x.png',
Expand Down Expand Up @@ -448,7 +456,11 @@ export const OrganizationHeader: React.FC<
return n('usingDefaultHeader', false) ? (
<DefaultHeader
{...defaultProps}
className={styles.hveHeaderGridContainer}
className={
isSubpage
? styles.hveHeaderGridContainerSubpage
: styles.hveHeaderGridContainer
}
image={n(
'hveHeaderImage',
'https://images.ctfassets.net/8k0h54kbe6bj/7ie5X2T4g8a7g5PLvu5226/4ec8b2cb69b5cb7193a61c562f9b36e0/minstur1.png',
Expand Down