diff options
| author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-12-22 08:30:00 +0800 |
|---|---|---|
| committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-12-22 08:30:00 +0800 |
| commit | f17fe381bfe18e1093f7a1c8f1c27431a0354d22 (patch) | |
| tree | 3a854627830bb5b3c0d9f1c45f2d1ddebbf50a16 | |
| parent | 26977f6408442883c20001a57a3b9001f4ab9b25 (diff) | |
| parent | 92150b78fcda1d1cb32255bc04c0e2139573e697 (diff) | |
| download | dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar.gz dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar.bz2 dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar.lz dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar.xz dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.tar.zst dexon-sol-tools-f17fe381bfe18e1093f7a1c8f1c27431a0354d22.zip | |
Merge branch 'development' into feature/instant/tell-amount-available
| -rw-r--r-- | packages/website/ts/@next/pages/about/jobs.tsx | 25 | ||||
| -rw-r--r-- | packages/website/ts/components/ui/container.tsx | 1 |
2 files changed, 16 insertions, 10 deletions
diff --git a/packages/website/ts/@next/pages/about/jobs.tsx b/packages/website/ts/@next/pages/about/jobs.tsx index 2fd2c7619..cdfb00775 100644 --- a/packages/website/ts/@next/pages/about/jobs.tsx +++ b/packages/website/ts/@next/pages/about/jobs.tsx @@ -4,8 +4,11 @@ import DocumentTitle from 'react-document-title'; import styled from 'styled-components'; import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout'; +import { Link } from 'ts/@next/components/link'; import { Column, FlexWrap, Section } from 'ts/@next/components/newLayout'; import { Heading, Paragraph } from 'ts/@next/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> diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx index 778f59f27..2ce03d0c2 100644 --- a/packages/website/ts/components/ui/container.tsx +++ b/packages/website/ts/components/ui/container.tsx @@ -9,6 +9,7 @@ type StringOrNum = string | number; export type ContainerTag = 'div' | 'span'; export interface ContainerProps { + children?: React.ReactNode; margin?: string; marginTop?: StringOrNum; marginBottom?: StringOrNum; |