aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Klebanoff <steve@0xproject.com>2018-12-21 03:17:42 +0800
committerGitHub <noreply@github.com>2018-12-21 03:17:42 +0800
commit1fa93fc8cec32f4c898512707e61dcc6e02fb4fd (patch)
tree9916726bfc5baf8db795689d6e12b72d19e9c73e
parent12177270df3f0164d4d070cdf675f2083fc1ba9d (diff)
parentca3e0b26c630ace7eecd9d99433f27f5290d3a76 (diff)
downloaddexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar.gz
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar.bz2
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar.lz
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar.xz
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.tar.zst
dexon-sol-tools-1fa93fc8cec32f4c898512707e61dcc6e02fb4fd.zip
Merge pull request #1462 from bakkenbaeck/feature/website/0x-org
[website] Fixes
-rw-r--r--packages/website/ts/@next/pages/about/jobs.tsx2
-rw-r--r--packages/website/ts/@next/pages/about/mission.tsx2
-rw-r--r--packages/website/ts/@next/pages/about/press.tsx5
-rw-r--r--packages/website/ts/@next/pages/about/team.tsx2
-rw-r--r--packages/website/ts/@next/pages/ecosystem.tsx2
-rw-r--r--packages/website/ts/@next/pages/instant.tsx2
-rw-r--r--packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx1
-rw-r--r--packages/website/ts/@next/pages/instant/rc-slider.css2
-rw-r--r--packages/website/ts/@next/pages/landing.tsx4
-rw-r--r--packages/website/ts/@next/pages/launch_kit.tsx2
-rw-r--r--packages/website/ts/@next/pages/why.tsx2
11 files changed, 23 insertions, 3 deletions
diff --git a/packages/website/ts/@next/pages/about/jobs.tsx b/packages/website/ts/@next/pages/about/jobs.tsx
index 4dc9d8002..2fd2c7619 100644
--- a/packages/website/ts/@next/pages/about/jobs.tsx
+++ b/packages/website/ts/@next/pages/about/jobs.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
@@ -98,6 +99,7 @@ export class NextAboutJobs extends React.Component<NextAboutJobsProps, NextAbout
linkLabel="Our mission and values"
href={constants.URL_MISSION_AND_VALUES_BLOG_POST}
>
+ <DocumentTitle title="Jobs at 0x" />
<Section bgColor="#F3F6F4" isFlex={true} maxWidth="1170px" wrapWidth="100%">
<Column maxWidth="442px">
<Heading size="medium" marginBottom="30px">
diff --git a/packages/website/ts/@next/pages/about/mission.tsx b/packages/website/ts/@next/pages/about/mission.tsx
index 35aac684b..2e6530edd 100644
--- a/packages/website/ts/@next/pages/about/mission.tsx
+++ b/packages/website/ts/@next/pages/about/mission.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
@@ -37,6 +38,7 @@ export const NextAboutMission = () => (
linkLabel="Our mission and values"
href={constants.URL_MISSION_AND_VALUES_BLOG_POST}
>
+ <DocumentTitle title="Our Mission - 0x" />
<Section isFullWidth={true} isPadded={false}>
<FullWidthImage>
<Image src="/images/@next/about/about-office.png" alt="0x Offices" isCentered={true} />
diff --git a/packages/website/ts/@next/pages/about/press.tsx b/packages/website/ts/@next/pages/about/press.tsx
index ef04506cf..030ee4c14 100644
--- a/packages/website/ts/@next/pages/about/press.tsx
+++ b/packages/website/ts/@next/pages/about/press.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
@@ -64,7 +65,9 @@ export const NextAboutPress = () => (
))}
</>
}
- />
+ >
+ <DocumentTitle title="Press Highlights - 0x" />
+ </AboutPageLayout>
);
export const Highlight: React.FunctionComponent<HighlightItemProps> = (props: HighlightItemProps) => {
diff --git a/packages/website/ts/@next/pages/about/team.tsx b/packages/website/ts/@next/pages/about/team.tsx
index 421cacb24..7177964be 100644
--- a/packages/website/ts/@next/pages/about/team.tsx
+++ b/packages/website/ts/@next/pages/about/team.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { colors } from 'ts/style/colors';
@@ -183,6 +184,7 @@ export const NextAboutTeam = () => (
linkLabel="Join the team"
to={WebsitePaths.AboutJobs}
>
+ <DocumentTitle title="Our Team - 0x" />
<Section maxWidth="1170px" wrapWidth="100%" isFlex={true} flexBreakpoint="900px">
<Column>
<Heading size="medium">0x Team</Heading>
diff --git a/packages/website/ts/@next/pages/ecosystem.tsx b/packages/website/ts/@next/pages/ecosystem.tsx
index 3d3e219a2..f78bd3bdc 100644
--- a/packages/website/ts/@next/pages/ecosystem.tsx
+++ b/packages/website/ts/@next/pages/ecosystem.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
import { colors } from 'ts/style/colors';
@@ -54,6 +55,7 @@ const benefits: BenefitProps[] = [
export const NextEcosystem = () => (
<SiteWrap theme="light">
+ <DocumentTitle title="Ecosystem Acceleration Program: Jumpstart your Business on 0x" />
<Section isTextCentered={true}>
<Column>
<Heading size="medium" isCentered={true}>
diff --git a/packages/website/ts/@next/pages/instant.tsx b/packages/website/ts/@next/pages/instant.tsx
index 8b3a417a9..d08fd566a 100644
--- a/packages/website/ts/@next/pages/instant.tsx
+++ b/packages/website/ts/@next/pages/instant.tsx
@@ -1,6 +1,7 @@
import { utils as sharedUtils } from '@0x/react-shared';
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import styled, { keyframes } from 'styled-components';
import { Banner } from 'ts/@next/components/banner';
@@ -87,6 +88,7 @@ export class Next0xInstant extends React.Component<Props> {
public render(): React.ReactNode {
return (
<SiteWrap>
+ <DocumentTitle title="0x Instant: Quick and secure crypto purchasing" />
<Hero
title="Introducing 0x Instant"
description="A free and flexible way to offer simple crypto purchasing in any app or website"
diff --git a/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx b/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx
index e9f8ba83b..5775d6dfb 100644
--- a/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx
+++ b/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx
@@ -22,6 +22,7 @@ export class FeePercentageSlider extends React.Component<FeePercentageSliderProp
max={0.05}
step={0.0025}
value={this.props.value}
+ disabled={this.props.isDisabled}
onChange={this.props.onChange}
tipFormatter={this._feePercentageSliderFormatter}
tipProps={{ placement: 'bottom', overlayStyle: { backgroundColor: '#fff', borderRadius: '4px' } }}
diff --git a/packages/website/ts/@next/pages/instant/rc-slider.css b/packages/website/ts/@next/pages/instant/rc-slider.css
index a4a521d54..63038324e 100644
--- a/packages/website/ts/@next/pages/instant/rc-slider.css
+++ b/packages/website/ts/@next/pages/instant/rc-slider.css
@@ -115,7 +115,7 @@
}
.rc-slider-disabled {
- background-color: #e9e9e9;
+ opacity: 0.2;
}
.rc-slider-disabled .rc-slider-track {
diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx
index ae560e8e3..4d47fefd9 100644
--- a/packages/website/ts/@next/pages/landing.tsx
+++ b/packages/website/ts/@next/pages/landing.tsx
@@ -1,10 +1,11 @@
import * as React from 'react';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
+import DocumentTitle from 'react-document-title';
import { SectionLandingAbout } from 'ts/@next/components/sections/landing/about';
import { SectionLandingClients } from 'ts/@next/components/sections/landing/clients';
import { SectionLandingCta } from 'ts/@next/components/sections/landing/cta';
import { SectionLandingHero } from 'ts/@next/components/sections/landing/hero';
+import { SiteWrap } from 'ts/@next/components/siteWrap';
import { ModalContact } from 'ts/@next/components/modals/modal_contact';
@@ -23,6 +24,7 @@ export class NextLanding extends React.Component<Props> {
public render(): React.ReactNode {
return (
<SiteWrap theme="dark">
+ <DocumentTitle title="0x: The protocol for trading tokens on Ethereum" />
<SectionLandingHero />
<SectionLandingAbout />
<SectionLandingClients />
diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx
index 7ae54293b..605bce91c 100644
--- a/packages/website/ts/@next/pages/launch_kit.tsx
+++ b/packages/website/ts/@next/pages/launch_kit.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import { Hero } from 'ts/@next/components/hero';
@@ -35,6 +36,7 @@ export class NextLaunchKit extends React.Component {
public render(): React.ReactNode {
return (
<SiteWrap theme="dark">
+ <DocumentTitle title="0x Launch Kit: Launch a relayer in under a minute" />
<Hero
isLargeTitle={false}
isFullWidth={false}
diff --git a/packages/website/ts/@next/pages/why.tsx b/packages/website/ts/@next/pages/why.tsx
index 73195f31c..cdf7960c2 100644
--- a/packages/website/ts/@next/pages/why.tsx
+++ b/packages/website/ts/@next/pages/why.tsx
@@ -1,5 +1,6 @@
import * as _ from 'lodash';
import * as React from 'react';
+import DocumentTitle from 'react-document-title';
import ScrollableAnchor, { configureAnchors } from 'react-scrollable-anchor';
import styled from 'styled-components';
@@ -98,6 +99,7 @@ export class NextWhy extends React.Component {
);
return (
<SiteWrap theme="dark">
+ <DocumentTitle title="Features & Benefits - 0x" />
<Hero
title="The exchange layer for the crypto economy"
description="The world's assets are becoming tokenized on public blockchains. 0x Protocol is free, open-source infrastracture that developers and businesses utilize to build products that enable the purchasing and trading of crypto tokens."