aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-07-19 05:27:06 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-07-19 05:27:06 +0800
commitb28a88dbb2d238f6d5212358ea6d06c4999cb9f2 (patch)
treeb991ef0894e625abb3a96c65cb58fc2dd771af45
parente6558b7135f87530010c95305f0689d31e8bceed (diff)
downloaddexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar.gz
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar.bz2
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar.lz
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar.xz
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.tar.zst
dexon-sol-tools-b28a88dbb2d238f6d5212358ea6d06c4999cb9f2.zip
Add /careers route and fix hr styling
-rw-r--r--packages/website/ts/components/footer.tsx2
-rw-r--r--packages/website/ts/index.tsx12
-rw-r--r--packages/website/ts/pages/about/about.tsx2
-rw-r--r--packages/website/ts/pages/jobs/jobs.tsx2
-rw-r--r--packages/website/ts/pages/jobs/open_positions.tsx6
-rw-r--r--packages/website/ts/style/colors.ts1
-rw-r--r--packages/website/ts/types.ts3
7 files changed, 19 insertions, 9 deletions
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 9fb332a98..6dcb5a0e9 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -115,7 +115,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
{
title: this.props.translate.get(Key.Careers, Deco.Cap),
isExternal: false,
- path: WebsitePaths.Jobs,
+ path: WebsitePaths.Careers,
},
{
title: this.props.translate.get(Key.Contact, Deco.Cap),
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 2a5c5e4f1..904a5f6df 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -77,10 +77,8 @@ render(
<Route exact={true} path="/" component={Landing as any} />
<Redirect from="/otc" to={`${WebsitePaths.Portal}`} />
{/* TODO: Remove this once we ship the jobs page*/}
- {utils.shouldShowJobsPage() ? (
- <Route path={WebsitePaths.Jobs} component={Jobs as any} />
- ) : (
- <Route path={WebsitePaths.Jobs} component={Redirector as any} />
+ {utils.shouldShowJobsPage() && (
+ <Route path={WebsitePaths.Careers} component={Jobs as any} />
)}
<Route path={WebsitePaths.Portal} component={LazyPortal} />
<Route path={WebsitePaths.FAQ} component={FAQ as any} />
@@ -131,6 +129,12 @@ render(
path={`${WebsiteLegacyPaths.Deployer}/:version?`}
component={LazySolCompilerDocumentation}
/>
+ {/* TODO: Remove this once we ship the jobs page*/}
+ {utils.shouldShowJobsPage() ? (
+ <Route path={WebsiteLegacyPaths.Jobs} component={Jobs as any} />
+ ) : (
+ <Route path={WebsiteLegacyPaths.Jobs} component={Redirector as any} />
+ )}
<Route path={`${WebsitePaths.Docs}`} component={LazyZeroExJSDocumentation} />
<Route component={NotFound as any} />
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 33581c938..b9bc906bd 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -314,7 +314,7 @@ export class About extends React.Component<AboutProps, AboutState> {
}}
>
We are seeking outstanding candidates to{' '}
- <Link to={WebsitePaths.Jobs} style={{ color: 'black' }}>
+ <Link to={WebsitePaths.Careers} style={{ color: 'black' }}>
join our team
</Link>
. We value passion, diversity and unique perspectives.
diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx
index 49d6422f5..6db19e67f 100644
--- a/packages/website/ts/pages/jobs/jobs.tsx
+++ b/packages/website/ts/pages/jobs/jobs.tsx
@@ -43,7 +43,7 @@ export class Jobs extends React.Component<JobsProps, JobsState> {
public render(): React.ReactNode {
return (
<div>
- <DocumentTitle title="Jobs" />
+ <DocumentTitle title="Careers at 0x" />
<TopBar
blockchainIsLoaded={false}
location={this.props.location}
diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx
index 408e4b720..160b198d6 100644
--- a/packages/website/ts/pages/jobs/open_positions.tsx
+++ b/packages/website/ts/pages/jobs/open_positions.tsx
@@ -47,7 +47,11 @@ export class OpenPositions extends React.Component<OpenPositionsProps, OpenPosit
const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm;
return (
<Container id={this.props.hash} className="mx-auto pb4 px3" maxWidth="1200px">
- {!isSmallScreen && <hr />}
+ {!isSmallScreen && (
+ <hr
+ style={{ border: 0, borderTop: 1, borderStyle: 'solid', borderColor: colors.jobsPageDivider }}
+ />
+ )}
<Container marginTop="64px" marginBottom="50px">
<Text fontFamily="Roboto Mono" fontSize="24px" fontColor={colors.black}>
Open Positions
diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts
index 349845a09..60a18ce14 100644
--- a/packages/website/ts/style/colors.ts
+++ b/packages/website/ts/style/colors.ts
@@ -10,6 +10,7 @@ const appColors = {
drawerMenuBackground: '#4a4a4a',
menuItemDefaultSelectedBackground: '#424242',
jobsPageBackground: sharedColors.grey50,
+ jobsPageDivider: '#cccccc',
jobsPageOpenPositionRow: sharedColors.grey100,
metaMaskOrange: '#f68c24',
metaMaskTransparentOrange: 'rgba(255, 248, 242, 0.8)',
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 4d0496f6c..e1b5be39a 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -356,6 +356,7 @@ export enum WebsiteLegacyPaths {
ZeroExJs = '/docs/0xjs',
Web3Wrapper = '/docs/web3_wrapper',
Deployer = '/docs/deployer',
+ Jobs = '/jobs',
}
export enum WebsitePaths {
@@ -376,7 +377,7 @@ export enum WebsitePaths {
Subproviders = '/docs/subproviders',
OrderUtils = '/docs/order-utils',
EthereumTypes = '/docs/ethereum-types',
- Jobs = '/jobs',
+ Careers = '/careers',
}
export enum DocPackages {