Skip to content

186 cleanup diversity and inclusion section #214

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
chrisnottca merged 3 commits into from
Apr 9, 2021
Merged

186 cleanup diversity and inclusion section #214

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94d9194
About us page - diversity&inclusion section UI cleanup #186
Apr 6, 2021
3a68689
186 diversity and inclusion: reduce padding on desktop resolution so …
chrisnottca Apr 9, 2021
371e1ab
186 fix linting issue
chrisnottca Apr 9, 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
87 changes: 66 additions & 21 deletions sections/diversity-and-inclusion-section/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,76 @@ import styled from 'styled-components'
import { Heading, Text } from 'components'
import { TABLET_LARGE_SIZE } from 'styles/constants'

const IMAGE_BREAKPOINT = '839px'
// for reference: image assets and sizes:
// filename width X height
// painted-hand-mobile.png 414px x 400px
// painted-hand-tablet.png 500px x 534px
// painted-hand-desktop.png 709px x 534px

const TABLET_IMAGE_BREAKPOINT = '828px' // width of painted-hand-mobile.png times two
const DESKTOP_IMAGE_BREAKPOINT = '1442px' // width of painted-hand-desktop.png times two plus 24px padding
const HEIGHT = '534px'

const { h2 } = Heading.VARIANT

const Container = styled.div`
display: flex;
flex-direction: row;
@media only screen and (max-width: ${IMAGE_BREAKPOINT}) {
flex-direction: column-reverse;
height: auto;
display: grid;
grid-template-columns: 50% 50%;
height: ${HEIGHT};
overflow-y: hidden;

@media only screen and (max-width: ${TABLET_IMAGE_BREAKPOINT}) {
display: grid;
grid-template-columns: 100%;
grid-template-rows: 50% 50%;
height: 100%;
}
`

const Picture = styled.picture`
img {
width: 100%;
height: 100%;
height: auto;
}

@media only screen and (min-width: ${TABLET_IMAGE_BREAKPOINT}) and (max-width: ${TABLET_LARGE_SIZE}) {
img {
width: auto;
height: 100%;
}
}

@media only screen and (max-width: ${TABLET_IMAGE_BREAKPOINT}) {
grid-row-start: 2;
img {
height: 100%;
width: 100%;
}
}
`

const TextContainer = styled.div`
width: 50%;
display: flex;
flex-direction: column;
flex-grow: 1;
flex-shrink: 1;
padding: ${rem('101px')} ${rem('80px')} ${rem('101px')} ${rem('70px')};

width: 100%;
height: ${HEIGHT};

padding: ${rem('101px')} 7% ${rem('101px')} 7%;
background: linear-gradient(61.68deg, #ff68ba 2.29%, #edc281 100.63%);
justify-content: center;
align-items: center;

@media only screen and (max-width: ${TABLET_LARGE_SIZE}) {
align-items: center;
padding: ${rem('48px')} ${rem('24px')};
padding: ${rem('70px')} ${rem('24px')};
}

@media only screen and (max-width: ${IMAGE_BREAKPOINT}) {
align-items: center;
@media only screen and (max-width: ${TABLET_IMAGE_BREAKPOINT}) {
grid-row-start: 1;
height: 100%;
padding: ${rem('84px')} ${rem('36px')};
width: 100%;
}
`

Expand All @@ -67,21 +97,36 @@ const StyledHeading = styled(Heading)`
@media only screen and (max-width: ${TABLET_LARGE_SIZE}) {
margin-bottom: ${rem('32px')};
}
@media only screen and (max-width: ${IMAGE_BREAKPOINT}) {
@media only screen and (max-width: ${TABLET_IMAGE_BREAKPOINT}) {
margin-bottom: ${rem('26px')};
}
`

const TabletImage = styled.source.attrs((props) => ({
...props,
media: `(min-width: ${TABLET_IMAGE_BREAKPOINT}) and (max-width:${DESKTOP_IMAGE_BREAKPOINT})`,
srcSet: '/painted-hand-tablet.png',
}))``

const DesktopImage = styled.source.attrs((props) => ({
...props,
media: `(min-width:${DESKTOP_IMAGE_BREAKPOINT})`,
srcSet: '/painted-hand-desktop.png',
}))``

const MobileImage = styled.img.attrs((props) => ({
...props,
src: '/painted-hand-mobile.png',
alt: 'Inclusive community',
}))``

const DiversityAndInclusionSection = () => (
<section>
<Container>
<Picture>
<source
media="(min-width:770px) and (max-width:1200px)"
srcSet="/painted-hand-tablet.png"
/>
<source media="(min-width:1201px)" srcSet="/painted-hand-desktop.png" />
<img src="/painted-hand-mobile.png" alt="Unicorn Pool Float" />
<TabletImage />
<DesktopImage />
<MobileImage />
</Picture>
<TextContainer>
<TextWrapper>
Expand Down