Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Pavel-Latyshov/fixes to locations #2506

Merged
merged 3 commits into from
Jan 14, 2022
Merged

Pavel-Latyshov/fixes to locations #2506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffe9dfd
fixes to locations
Jan 13, 2022
cc8c0e7
fix border radius
Jan 14, 2022
1d60db5
add border radius to hero
Jan 14, 2022
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
1 change: 1 addition & 0 deletions src/components/form/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export const SharedButtonStyle = css`
padding: 17px 24px;
font-size: 20px;
line-height: 30px;
border-radius: 8px;

&:hover {
background-color: var(--color-red-3);
Expand Down
25 changes: 8 additions & 17 deletions src/pages/careers/locations/_location-layout-new-offices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,7 @@ const SecondStyledHeader = styled(Header)`

margin-bottom: 0 24px;
`
const StyledLinkButton = styled(LinkButton)`
font-size: 20px;
line-height: 30px;
@media ${device.tablet} {
font-size: 18px;
max-width: 317px;
}
@media (max-width: 340px) {
font-size: 15px;
}
`

type HeroProps = {
display_name: string
img_data: string
Expand All @@ -57,16 +47,16 @@ const Hero = ({ display_name, img_data }: HeroProps) => {
<StyledBackground data={img_data} alt={display_name}>
<StyledContainer>
<StyledHeader as="h1">{display_name}</StyledHeader>
<StyledLinkButton
<LinkButton
hero
has_no_end_slash
secondary="true"
to={zoho_url}
target="_blank"
rel="noopener noreferrer"
external
>
View open positions in {display_name}
</StyledLinkButton>
</LinkButton>
</StyledContainer>
</StyledBackground>
)
Expand Down Expand Up @@ -240,11 +230,12 @@ export const NewLocationLayout = ({ location, images }: LocationLayoutProps) =>
align="center"
as="h2"
size="var(--text-size-header-5)"
color="black-6"
>
Deriv in {display_name}
</SecondStyledHeader>
<Flex tablet_direction="column">
<Text>{location.first_p}</Text>
<Text color="black-6">{location.first_p}</Text>
<StyledImageWrapper>
<QueryImage
data={images[location.first_img]}
Expand All @@ -266,10 +257,10 @@ export const NewLocationLayout = ({ location, images }: LocationLayoutProps) =>
/>
<WorkingInformation p="3.2rem 6rem" direction="column">
<StyledDiv>
<Header as="h3" type="subtitle-1">
<Header as="h3" type="subtitle-1" color="black-6">
{`Working at Deriv ${map_office_name}`}
</Header>
<CardText>{location.map_text}</CardText>
<CardText color="black-6">{location.map_text}</CardText>
</StyledDiv>
</WorkingInformation>
</WorkingFlex>
Expand Down
26 changes: 9 additions & 17 deletions src/pages/careers/locations/_location-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,7 @@ const SecondStyledHeader = styled(Header)`

margin-bottom: 0 24px;
`
const StyledLinkButton = styled(LinkButton)`
font-size: 20px;
line-height: 30px;
@media ${device.tablet} {
font-size: 18px;
max-width: 317px;
}
@media (max-width: 340px) {
font-size: 15px;
}
`

type HeroProps = {
display_name: string
img_data: string
Expand All @@ -67,16 +57,16 @@ const Hero = ({ display_name, img_data }: HeroProps) => {
<StyledBackground data={img_data} alt={display_name}>
<StyledContainer>
<StyledHeader as="h1">{display_name}</StyledHeader>
<StyledLinkButton
<LinkButton
hero
has_no_end_slash
secondary="true"
to={zoho_url}
target="_blank"
rel="noopener noreferrer"
external
>
View open positions in {display_name}
</StyledLinkButton>
</LinkButton>
</StyledContainer>
</StyledBackground>
)
Expand Down Expand Up @@ -358,6 +348,7 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {
<Hero display_name={display_name} img_data={images[location.name]} />
<FirstSection>
<SecondStyledHeader
color="black-6"
type="unset"
align="center"
as="h2"
Expand All @@ -366,7 +357,7 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {
Deriv in {display_name}
</SecondStyledHeader>
<Flex tablet_direction="column">
<Text>{location.first_p}</Text>
<Text color="black-6">{location.first_p}</Text>
<StyledImageWrapper>
<QueryImage
data={images[location.first_img]}
Expand All @@ -380,6 +371,7 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {
<SecondSection padding="0px 16px">
<SectionContainer padding="0">
<Header
color="black-6"
type="unset"
align="center"
as="h2"
Expand Down Expand Up @@ -457,10 +449,10 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {
max_width="44.4rem"
>
<StyledDiv>
<Header as="h3" type="subtitle-1">
<Header as="h3" type="subtitle-1" color="black-6">
{`Working at Deriv ${map_office_name}`}
</Header>
<CardText>{location.map_text}</CardText>
<CardText color="black-6">{location.map_text}</CardText>
<Flex jc="unset">
<Pin src={MapPin} alt="map pin" />
{location.google_map_link ? (
Expand Down