aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-12-27 19:00:20 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-12-27 19:00:20 +0800
commitdc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc (patch)
tree9d10d446df5696986b97fa9b61eb7a85d291e481 /packages/website/ts
parentc31f527116c4b476e9fb86148f72a7c3b0486082 (diff)
parentfebf3489ba45b11ec0d41ac212219d6e1e269a3f (diff)
downloaddexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar.gz
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar.bz2
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar.lz
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar.xz
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.tar.zst
dexon-sol-tools-dc6d6024dc7e72d2634c6bbd88886af6cc0ef6fc.zip
fix: merge conflict
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/pages/about/jobs.tsx25
1 files changed, 15 insertions, 10 deletions
diff --git a/packages/website/ts/pages/about/jobs.tsx b/packages/website/ts/pages/about/jobs.tsx
index 648190380..ee1aa6cef 100644
--- a/packages/website/ts/pages/about/jobs.tsx
+++ b/packages/website/ts/pages/about/jobs.tsx
@@ -4,8 +4,11 @@ import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { AboutPageLayout } from 'ts/components/aboutPageLayout';
+import { Link } from 'ts/components/link';
import { Column, FlexWrap, Section } from 'ts/components/newLayout';
import { Heading, Paragraph } from 'ts/components/text';
+import { Container } from 'ts/components/ui/container';
+import { colors } from 'ts/style/colors';
import { WebsiteBackendJobInfo } from 'ts/types';
import { backendClient } from 'ts/utils/backend_client';
import { constants } from 'ts/utils/constants';
@@ -26,25 +29,27 @@ const Position: React.FunctionComponent<PositionItemProps> = (props: PositionIte
const { position } = props;
return (
<PositionWrap>
- <StyledColumn width="30%">
- <Heading asElement="h3" size="small" fontWeight="400" marginBottom="0">
- <a href={position.href} target="_blank">
- {position.title}
- </a>
- </Heading>
+ <StyledColumn width="50%">
+ <Container position="relative" top="-3px" paddingRight="12px">
+ <Heading asElement="h3" size="small" fontWeight="400" marginBottom="0">
+ <a href={position.href} target="_blank">
+ {position.title}
+ </a>
+ </Heading>
+ </Container>
</StyledColumn>
- <StyledColumn width="50%" padding="0 40px 0 0">
+ <StyledColumn width="30%" padding="0 40px 0 0">
<Paragraph isMuted={true} marginBottom="0">
{position.location}
</Paragraph>
</StyledColumn>
<StyledColumn width="20%">
- <Paragraph marginBottom="0" textAlign="right">
- <a href={position.href} target="_blank">
+ <Paragraph marginBottom="0" textAlign="right" color={colors.brandDark} fontWeight={400}>
+ <Link href={position.href} target="_blank">
Apply
- </a>
+ </Link>
</Paragraph>
</StyledColumn>
</PositionWrap>