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

Fix tablet mode and change breakpoints values from figma #44

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Fix tablet mode and change breakpoints values from figma #44

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
23 changes: 15 additions & 8 deletions src/components/Audits/Audits.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ const MainContainer = styled.div`
justify-content: center;
max-width: 1100px;
margin: auto;
padding: 0 16px;
padding: 0 34px;

@media ${device.md} {
padding: 0px 40px;
}
`

const Title = styled.div`
Expand All @@ -26,7 +30,7 @@ const Title = styled.div`
max-width: 300px;
line-height: 42px;

@media ${device.sm} {
@media ${device.md} {
font-size: 36px;
max-width: 370px;
}
Expand All @@ -47,21 +51,24 @@ const AuditorsContainer = styled.div`
border-top: 1px solid #232323;
justify-content: space-between;

@media ${device.sm} {
@media ${device.md} {
flex-wrap: wrap;
flex-direction: row;
justify-content: start;
gap: 80px;
}

@media ${device.md} {
gap: 100px;
}
`

const AuditorContainer = styled.div`
display: flex;
flex-direction: column;
border-bottom: 1px solid #232323;
width: 100%;
width: 300px;
padding: 20px 0 25px;

@media ${device.sm} {
width: 300px;
}
`

const AuditorLogo = styled.div<{src: string}>`
Expand Down
26 changes: 18 additions & 8 deletions src/components/Contributing/Contributing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,26 @@ import OverlayLogoHeartCatImg from '../../assets/images/overlay-heart-cat.jpg'

const Wrapper = styled.div`
overflow-x: hidden !important;
padding: 80px 0px 160px;
padding: 0px 0px 160px;

@media ${device.lg} {
padding: 80px 0px 160px;
}
`

const MainContainer = styled.div`
display: flex;
flex-direction: column;
max-width: 1100px;
margin: auto;
justify-content: space-between;
padding: 0 16px;
justify-content: start;
padding: 0 34px;
margin-bottom: 80px;

@media ${device.sm} {
@media ${device.lg} {
flex-direction: row;
margin: auto;
margin-bottom: 40px;
justify-content: space-between;
}
`

Expand All @@ -33,18 +38,23 @@ const ContributingImageContainer = styled.div`
width: 100%;
}

@media ${device.sm} {
margin: 20px;
@media ${device.md} {
max-width: 450px;
max-height: 450px;
}
@media ${device.lg} {
margin: 20px;
}
`

const ContributingTextContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
margin: auto 60px auto auto;

@media ${device.lg} {
margin: auto 60px auto auto;
}
`

const Title = styled.div`
Expand Down
13 changes: 8 additions & 5 deletions src/components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Wrapper = styled.div`
background: #f0f0f0;
padding: 35px 16px;

@media ${device.sm} {
@media ${device.md} {
padding: 55px 16px;
}
`
Expand All @@ -23,7 +23,7 @@ const InteractiveContentsContainer = styled.div`
display: flex;
flex-direction: column;

@media ${device.sm} {
@media ${device.md} {
flex-direction: row;
}
`
Expand All @@ -32,7 +32,10 @@ const BrandContainer = styled.div`
width: auto;
margin-bottom: 20px;

@media ${device.sm} {
@media ${device.md} {
min-width: 300px;
}
@media ${device.lg} {
min-width: 400px;
}
`
Expand All @@ -56,7 +59,7 @@ const LinksContainer = styled.div`
justify-content: space-between;
padding: 18px 0px 0px 18px;

@media ${device.sm} {
@media ${device.md} {
padding: 18px 0px 0px 0px;
}
`
Expand All @@ -68,7 +71,7 @@ const LinksColumn = styled.div`
width: 40%;
margin-bottom: 25px;

@media ${device.sm} {
@media ${device.md} {
width: auto;
}
`
Expand Down
9 changes: 5 additions & 4 deletions src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ export const HeaderContainer = styled.div`
justify-content: space-between;
margin: 16px;

@media ${device.sm} {
@media ${device.md} {
margin: 32px auto 64px;
padding: 0 16px;
}
`

export const FlexRow = styled.div`
display: flex;
width: 700px;
justify-content: space-between;
`

export const LogoContainer = styled.div`
Expand All @@ -45,7 +47,6 @@ const LinksContainer = styled.div`
@media ${device.lg} {
display: flex;
flex-direction: row;
margin-left: 96px;
}
`

Expand All @@ -61,7 +62,7 @@ const StyledLink = styled.a`
const ButtonsContainer = styled.div`
display: none;

@media ${device.sm} {
@media ${device.md} {
display: flex;
flex-direction: row;
align-items: center;
Expand Down Expand Up @@ -102,7 +103,7 @@ const MobileOnly = styled.div`
display: flex;
margin-right: 8px;

@media ${device.sm} {
@media ${device.md} {
display: none;
}
`
Expand Down
26 changes: 18 additions & 8 deletions src/components/Hero/Hero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ const HeroContainer = styled.div`
justify-content: center;
padding: 160px 16px 45px;

@media ${device.sm} {
background-position: center;
@media ${device.md} {
min-height: 480px;
}
`
Expand All @@ -27,22 +26,33 @@ const SplitViewContainer = styled.div`
display: flex;
flex-direction: row;
max-width: 1115px;

@media ${device.md} {
padding-left: 64px;
}
@media ${device.xl} {
padding-left: 0;
max-width: 1100px;
}
`

const PrimaryViewContainer = styled.div`
display: flex;
flex-direction: column;
width: auto;

@media ${device.sm} {
width: 50%;

@media ${device.md} {
width: 60%;
}
@media ${device.lg} {
width: 50%;
}
`

const SecondaryViewContainer = styled.div`
display: none;

@media ${device.sm} {
@media ${device.lg} {
display: flex;
flex-direction: column;
width: 50%;
Expand All @@ -58,7 +68,7 @@ const Title = styled.div`
margin-bottom: 24px;
max-width: 300px;

@media ${device.sm} {
@media ${device.md} {
font-size: 69px;
max-width: none;
}
Expand All @@ -72,7 +82,7 @@ const Description = styled.div`
max-width: 330px;
line-height: 25px;

@media ${device.sm} {
@media ${device.md} {
font-size: 20px;
}
`
Expand Down
13 changes: 10 additions & 3 deletions src/components/Investors/Investors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,21 @@ const Text = styled.div`
margin-bottom: 10px;
`

const StyledBox = styled(Box)`
display: flex;
flex-wrap: wrap;
justify-content: center;
column-gap: 30px;
`

const Investor = styled.div<{
src?: string
width?: number
height?: number
}>`
display: flex;
background: url(${({src}) => src ?? src});
margin: auto;
margin: auto 0;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
Expand Down Expand Up @@ -82,11 +89,11 @@ const Investors = () => {
<Wrapper>
<MainContainer>
<Text>Backed by the best</Text>
<Box style={{display: 'flex', flexDirection: 'row', flexWrap: 'wrap'}}>
<StyledBox>
{investorsList.map(investor => (
<Investor src={investor.logoSrc} width={investor.width} height={investor.height} />
))}
</Box>
</StyledBox>
</MainContainer>
</Wrapper>
)
Expand Down
17 changes: 13 additions & 4 deletions src/components/Markets/Markets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ const MainContainer = styled.div`
flex-direction: column;
max-width: 1100px;
margin: auto;
padding: 80px 16px;
padding: 80px 34px;

@media ${device.md} {
padding: 80px 40px;
}
`

const HeaderContainer = styled.div`
Expand All @@ -17,8 +21,9 @@ const HeaderContainer = styled.div`
width: 100%;
justify-content: space-between;

@media ${device.sm} {
@media ${device.md} {
flex-direction: row;
gap: 80px;
}
`

Expand All @@ -30,7 +35,7 @@ const Title = styled.div`
margin-bottom: 20px;
line-height: 42px;

@media ${device.sm} {
@media ${device.md} {
max-width: 450px;
}
`
Expand All @@ -39,9 +44,13 @@ const Description = styled.div`
font-family: 'Inter', sans-serif;
font-size: 18px;
color: #7b7b7b;
max-width: 650px;
max-width: 350px;
margin-bottom: 20px;
line-height: 25px;

@media ${device.md} {
max-width: 650px;
}
`

const Markets = () => {
Expand Down
10 changes: 7 additions & 3 deletions src/components/News/News.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ const MainContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
padding: 80px 16px;
padding: 80px 34px;
background: url(${NewsBackground});
background-position: center;
background-repeat: no-repeat;
background-size: contain;

@media ${device.md} {
padding: 80px 40px;
}
`

const Title = styled.div`
Expand All @@ -33,7 +37,7 @@ const NewsPlatformContainer = styled.div`
border-top: 0.5px solid #232323;
border-bottom: 0.5px solid #232323;

@media ${device.sm} {
@media ${device.md} {
flex-direction: row;
}
`
Expand All @@ -49,7 +53,7 @@ const Logo = styled.img`
margin: 16px auto;
width: 215px;

@media ${device.sm} {
@media ${device.md} {
margin: auto;
}
`
Expand Down
Loading