crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
fragosti 2018-12-27 12:00:20 +01:00
commit dc6d6024dc
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/website/ts/pages/about/jobs.tsx
View File

@ -4,8 +4,11 @@ import DocumentTitle from 'react-document-title';
import styled from 'styled-components'; import styled from 'styled-components';
import { AboutPageLayout } from 'ts/components/aboutPageLayout'; import { AboutPageLayout } from 'ts/components/aboutPageLayout';
import { Link } from 'ts/components/link';
import { Column, FlexWrap, Section } from 'ts/components/newLayout'; import { Column, FlexWrap, Section } from 'ts/components/newLayout';
import { Heading, Paragraph } from 'ts/components/text'; 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 { WebsiteBackendJobInfo } from 'ts/types';
import { backendClient } from 'ts/utils/backend_client'; import { backendClient } from 'ts/utils/backend_client';
import { constants } from 'ts/utils/constants'; import { constants } from 'ts/utils/constants';
@ -26,25 +29,27 @@ const Position: React.FunctionComponent<PositionItemProps> = (props: PositionIte
const { position } = props; const { position } = props;
return ( return (
<PositionWrap> <PositionWrap>
<StyledColumn width="30%"> <StyledColumn width="50%">
<Container position="relative" top="-3px" paddingRight="12px">
<Heading asElement="h3" size="small" fontWeight="400" marginBottom="0"> <Heading asElement="h3" size="small" fontWeight="400" marginBottom="0">
<a href={position.href} target="_blank"> <a href={position.href} target="_blank">
{position.title} {position.title}
</a> </a>
</Heading> </Heading>
</Container>
</StyledColumn> </StyledColumn>
<StyledColumn width="50%" padding="0 40px 0 0"> <StyledColumn width="30%" padding="0 40px 0 0">
<Paragraph isMuted={true} marginBottom="0"> <Paragraph isMuted={true} marginBottom="0">
{position.location} {position.location}
</Paragraph> </Paragraph>
</StyledColumn> </StyledColumn>
<StyledColumn width="20%"> <StyledColumn width="20%">
<Paragraph marginBottom="0" textAlign="right"> <Paragraph marginBottom="0" textAlign="right" color={colors.brandDark} fontWeight={400}>
<a href={position.href} target="_blank"> <Link href={position.href} target="_blank">
Apply Apply
</a> </Link>
</Paragraph> </Paragraph>
</StyledColumn> </StyledColumn>
</PositionWrap> </PositionWrap>