From 5b4b4123e538400b5d15c5c9375dc77142f418bc Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:04:24 +0100 Subject: Fix mobile nav placement --- packages/website/ts/@next/components/mobileNav.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/website/ts/@next/components/mobileNav.tsx b/packages/website/ts/@next/components/mobileNav.tsx index 52a46ed69..93ea74c6d 100644 --- a/packages/website/ts/@next/components/mobileNav.tsx +++ b/packages/website/ts/@next/components/mobileNav.tsx @@ -109,6 +109,8 @@ const Section = styled.div<{ isDark?: boolean }>` `; const Grid = styled(WrapGrid)` + justify-content: flex-start; + li { width: 50%; flex-shrink: 0; -- cgit v1.2.3 From 96d89ddade8c993dd0977c37a58eac60e9db383b Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:07:00 +0100 Subject: Fix portal link --- packages/website/ts/@next/components/header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/@next/components/header.tsx index fde549642..d5894f65a 100644 --- a/packages/website/ts/@next/components/header.tsx +++ b/packages/website/ts/@next/components/header.tsx @@ -89,7 +89,7 @@ class HeaderBase extends React.Component { Trade on 0x -- cgit v1.2.3 From 85edc297f691bd842af1a9449c2e96ccdfa7c066 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:14:43 +0100 Subject: Fix mobile links --- packages/website/ts/@next/components/mobileNav.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/website/ts/@next/components/mobileNav.tsx b/packages/website/ts/@next/components/mobileNav.tsx index 93ea74c6d..ec1e76366 100644 --- a/packages/website/ts/@next/components/mobileNav.tsx +++ b/packages/website/ts/@next/components/mobileNav.tsx @@ -24,12 +24,12 @@ export class MobileNav extends React.PureComponent {
  • - - 0x instant + + 0x Instant
  • - + 0x Launch Kit
    • @@ -49,9 +49,9 @@ export class MobileNav extends React.PureComponent {
  • - + Blog - +
    • -- cgit v1.2.3 From d12e881e62fd98fff75143062be1a3df73650266 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:15:32 +0100 Subject: Fix homepage icon --- .../website/ts/@next/icons/illustrations/descriptionCopy.svg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg b/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg index a8e454ffd..6c9b5f0fc 100755 --- a/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg +++ b/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file -- cgit v1.2.3 From c2b355c25e8e5e207260ee98653ea654d4c904c1 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:16:31 +0100 Subject: Fix typo --- packages/website/ts/@next/components/sections/landing/about.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/ts/@next/components/sections/landing/about.tsx b/packages/website/ts/@next/components/sections/landing/about.tsx index 700d5e7d2..ee1cfb434 100644 --- a/packages/website/ts/@next/components/sections/landing/about.tsx +++ b/packages/website/ts/@next/components/sections/landing/about.tsx @@ -26,7 +26,7 @@ export const SectionLandingAbout = () => ( isMuted={1} padding={['large', 0, 'default', 0]} > - Anyone in the world can use 0x to service a wide variety of markets ranging from gaming items to financial instruments to assets that could have near existed before. + Anyone in the world can use 0x to service a wide variety of markets ranging from gaming items to financial instruments to assets that could have never existed before. -- cgit v1.2.3 From 8988650c8bce9006ec15519edd5c5d05ce1e9341 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:30:11 +0100 Subject: Fix newsletter input color in light theme --- .../website/ts/@next/components/newsletter_form.tsx | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/website/ts/@next/components/newsletter_form.tsx b/packages/website/ts/@next/components/newsletter_form.tsx index 859cd1d9c..6dc4bf678 100644 --- a/packages/website/ts/@next/components/newsletter_form.tsx +++ b/packages/website/ts/@next/components/newsletter_form.tsx @@ -1,13 +1,20 @@ import * as React from 'react'; -import styled from 'styled-components'; +import styled, { withTheme } from 'styled-components'; import { colors } from 'ts/style/colors'; +import {ThemeValuesInterface} from 'ts/@next/components/siteWrap'; + +interface FormProps { + theme: ThemeValuesInterface; +} + interface InputProps { isSubmitted: boolean; name: string; type: string; label: string; + textColor: string; } interface ArrowProps { @@ -26,18 +33,19 @@ const Input = React.forwardRef((props: InputProps, ref: React.Ref { public emailInput = React.createRef(); public state = { isSubmitted: false, }; public render(): React.ReactNode { const {isSubmitted} = this.state; + const {theme} = this.props; return ( - + @@ -74,6 +82,8 @@ export class NewsletterForm extends React.Component { } } +export const NewsletterForm = withTheme(Form); + const StyledForm = styled.form` appearance: none; border: 0; @@ -82,12 +92,12 @@ const StyledForm = styled.form` margin-top: 27px; `; -const StyledInput = styled.input` +const StyledInput = styled.input` appearance: none; background-color: transparent; border: 0; border-bottom: 1px solid #393939; - color: #fff; + color: ${props => props.textColor || '#fff'}; font-size: 1.294117647rem; padding: 15px 0; outline: none; -- cgit v1.2.3 From 240e3558fa4accd920d43bc8971d49fed5b965a6 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:38:47 +0100 Subject: Update client list + logos --- .../website/public/images/@next/clients/bamboo.svg | 17 +++++++++++ .../public/images/@next/clients/client-amadeus.png | Bin 2792 -> 0 bytes .../public/images/@next/clients/client-ddex.png | Bin 2183 -> 0 bytes .../public/images/@next/clients/client-decent.png | Bin 2006 -> 0 bytes .../public/images/@next/clients/client-dex.png | Bin 1827 -> 0 bytes .../public/images/@next/clients/client-oceanx.png | Bin 3198 -> 0 bytes .../images/@next/clients/client-openrelay.png | Bin 3178 -> 0 bytes .../public/images/@next/clients/client-paradex.png | Bin 2275 -> 0 bytes .../public/images/@next/clients/client-radar.png | Bin 2432 -> 0 bytes .../website/public/images/@next/clients/ercdex.svg | 16 +++++++++++ .../public/images/@next/clients/ledgerdex.svg | 19 ++++++++++++ .../public/images/@next/clients/openrelay.svg | 22 ++++++++++++++ .../public/images/@next/clients/paradex.svg | 9 ++++++ .../public/images/@next/clients/radar-relay.svg | 13 +++++++++ .../public/images/@next/clients/sharkrelay.svg | 32 +++++++++++++++++++++ .../public/images/@next/clients/starbitex.svg | 22 ++++++++++++++ .../public/images/@next/clients/tokenjar.svg | 13 +++++++++ .../@next/components/sections/landing/clients.tsx | 29 ++++++++++--------- 18 files changed, 178 insertions(+), 14 deletions(-) create mode 100644 packages/website/public/images/@next/clients/bamboo.svg delete mode 100755 packages/website/public/images/@next/clients/client-amadeus.png delete mode 100755 packages/website/public/images/@next/clients/client-ddex.png delete mode 100755 packages/website/public/images/@next/clients/client-decent.png delete mode 100755 packages/website/public/images/@next/clients/client-dex.png delete mode 100755 packages/website/public/images/@next/clients/client-oceanx.png delete mode 100755 packages/website/public/images/@next/clients/client-openrelay.png delete mode 100755 packages/website/public/images/@next/clients/client-paradex.png delete mode 100755 packages/website/public/images/@next/clients/client-radar.png create mode 100644 packages/website/public/images/@next/clients/ercdex.svg create mode 100644 packages/website/public/images/@next/clients/ledgerdex.svg create mode 100644 packages/website/public/images/@next/clients/openrelay.svg create mode 100644 packages/website/public/images/@next/clients/paradex.svg create mode 100644 packages/website/public/images/@next/clients/radar-relay.svg create mode 100644 packages/website/public/images/@next/clients/sharkrelay.svg create mode 100644 packages/website/public/images/@next/clients/starbitex.svg create mode 100644 packages/website/public/images/@next/clients/tokenjar.svg diff --git a/packages/website/public/images/@next/clients/bamboo.svg b/packages/website/public/images/@next/clients/bamboo.svg new file mode 100644 index 000000000..702b7d5aa --- /dev/null +++ b/packages/website/public/images/@next/clients/bamboo.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/client-amadeus.png b/packages/website/public/images/@next/clients/client-amadeus.png deleted file mode 100755 index 07a720721..000000000 Binary files a/packages/website/public/images/@next/clients/client-amadeus.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-ddex.png b/packages/website/public/images/@next/clients/client-ddex.png deleted file mode 100755 index 41cb36b53..000000000 Binary files a/packages/website/public/images/@next/clients/client-ddex.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-decent.png b/packages/website/public/images/@next/clients/client-decent.png deleted file mode 100755 index d0e5881b9..000000000 Binary files a/packages/website/public/images/@next/clients/client-decent.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-dex.png b/packages/website/public/images/@next/clients/client-dex.png deleted file mode 100755 index 546387449..000000000 Binary files a/packages/website/public/images/@next/clients/client-dex.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-oceanx.png b/packages/website/public/images/@next/clients/client-oceanx.png deleted file mode 100755 index d97b7bc37..000000000 Binary files a/packages/website/public/images/@next/clients/client-oceanx.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-openrelay.png b/packages/website/public/images/@next/clients/client-openrelay.png deleted file mode 100755 index e7d9767f4..000000000 Binary files a/packages/website/public/images/@next/clients/client-openrelay.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-paradex.png b/packages/website/public/images/@next/clients/client-paradex.png deleted file mode 100755 index 224b443e9..000000000 Binary files a/packages/website/public/images/@next/clients/client-paradex.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/client-radar.png b/packages/website/public/images/@next/clients/client-radar.png deleted file mode 100755 index 782a76369..000000000 Binary files a/packages/website/public/images/@next/clients/client-radar.png and /dev/null differ diff --git a/packages/website/public/images/@next/clients/ercdex.svg b/packages/website/public/images/@next/clients/ercdex.svg new file mode 100644 index 000000000..41a0ff3b0 --- /dev/null +++ b/packages/website/public/images/@next/clients/ercdex.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/ledgerdex.svg b/packages/website/public/images/@next/clients/ledgerdex.svg new file mode 100644 index 000000000..44126012e --- /dev/null +++ b/packages/website/public/images/@next/clients/ledgerdex.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/openrelay.svg b/packages/website/public/images/@next/clients/openrelay.svg new file mode 100644 index 000000000..21e32cc18 --- /dev/null +++ b/packages/website/public/images/@next/clients/openrelay.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/paradex.svg b/packages/website/public/images/@next/clients/paradex.svg new file mode 100644 index 000000000..e3bdf48b1 --- /dev/null +++ b/packages/website/public/images/@next/clients/paradex.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/radar-relay.svg b/packages/website/public/images/@next/clients/radar-relay.svg new file mode 100644 index 000000000..ecc759fab --- /dev/null +++ b/packages/website/public/images/@next/clients/radar-relay.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/sharkrelay.svg b/packages/website/public/images/@next/clients/sharkrelay.svg new file mode 100644 index 000000000..41d5376de --- /dev/null +++ b/packages/website/public/images/@next/clients/sharkrelay.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/starbitex.svg b/packages/website/public/images/@next/clients/starbitex.svg new file mode 100644 index 000000000..eee21b3fc --- /dev/null +++ b/packages/website/public/images/@next/clients/starbitex.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/public/images/@next/clients/tokenjar.svg b/packages/website/public/images/@next/clients/tokenjar.svg new file mode 100644 index 000000000..f36a6c6aa --- /dev/null +++ b/packages/website/public/images/@next/clients/tokenjar.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/website/ts/@next/components/sections/landing/clients.tsx b/packages/website/ts/@next/components/sections/landing/clients.tsx index 8e2347d02..e411feeb0 100644 --- a/packages/website/ts/@next/components/sections/landing/clients.tsx +++ b/packages/website/ts/@next/components/sections/landing/clients.tsx @@ -18,39 +18,40 @@ interface StyledProjectInterface { const projects: ProjectLogo[] = [ { name: 'Radar Relay', - imageUrl: 'images/@next/clients/client-radar.png', + imageUrl: 'images/@next/clients/radar-relay.svg', persistOnMobile: true, }, { name: 'Paradex', - imageUrl: 'images/@next/clients/client-paradex.png', + imageUrl: 'images/@next/clients/paradex.svg', persistOnMobile: true, }, { - name: 'The Ocean X', - imageUrl: 'images/@next/clients/client-oceanx.png', + name: 'Star Bit Ex', + imageUrl: 'images/@next/clients/starbitex.svg', }, { - name: 'Decent EX', - imageUrl: 'images/@next/clients/client-decent.png', + name: 'LedgerDex', + imageUrl: 'images/@next/clients/ledgerdex.svg', }, { - name: 'dEX', - imageUrl: 'images/@next/clients/client-dex.png', + name: 'OpenRelay', + imageUrl: 'images/@next/clients/openrelay.svg', + persistOnMobile: true, }, { - name: 'OpenRelay', - imageUrl: 'images/@next/clients/client-openrelay.png', + name: 'Bamboo Relay', + imageUrl: 'images/@next/clients/bamboo.svg', persistOnMobile: true, }, { - name: 'Amadeus', - imageUrl: 'images/@next/clients/client-amadeus.png', + name: 'Shark Relay', + imageUrl: 'images/@next/clients/sharkrelay.svg', persistOnMobile: true, }, { - name: 'DDEX', - imageUrl: 'images/@next/clients/client-ddex.png', + name: 'dEX', + imageUrl: 'images/@next/clients/ercdex.svg', persistOnMobile: true, }, ]; -- cgit v1.2.3 From 6eb8256555ad276c374d9cf4410db1f19141e884 Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Mon, 17 Dec 2018 11:38:47 +0100 Subject: Resolves font flicker on route change - Adds formular css to globally linked css --- packages/website/public/css/formular.css | 8 ++++---- packages/website/public/index.html | 1 + packages/website/ts/@next/constants/globalStyle.tsx | 14 -------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/packages/website/public/css/formular.css b/packages/website/public/css/formular.css index 84f68584c..85549f8c8 100644 --- a/packages/website/public/css/formular.css +++ b/packages/website/public/css/formular.css @@ -30,8 +30,8 @@ @font-face { font-family: 'Formular'; font-weight: 300; - src: url('/fonts/formular/3822A0_0_0.eot'); - src: url('/fonts/formular/3822A0_0_0.eot?#iefix') format('embedded-opentype'), url('/fonts/formular/3822A0_0_0.woff2') format('woff2'), url('/fonts/formular/3822A0_0_0.woff') format('woff'), url('/fonts/formular/3822A0_0_0.ttf') format('truetype'); + src: url('../fonts/Formular-Light.woff2'); + src: url('../fonts/Formular-Light.woff2') format('woff2'), url('../fonts/Formular-Light.woff') format('woff'); font-display: swap; } @@ -39,7 +39,7 @@ @font-face { font-family: 'Formular'; font-weight: 400; - src: url('/fonts/formular/3822A0_1_0.eot'); - src: url('/fonts/formular/3822A0_1_0.eot?#iefix') format('embedded-opentype'), url('/fonts/formular/3822A0_1_0.woff2') format('woff2'), url('/fonts/formular/3822A0_1_0.woff') format('woff'), url('/fonts/formular/3822A0_1_0.ttf') format('truetype'); + src: url('../fonts/Formular-Regular.woff2'); + src: url('../fonts/Formular-Regular.woff2') format('woff2'), url('../fonts/Formular-Regular.woff') format('woff'); font-display: swap; } diff --git a/packages/website/public/index.html b/packages/website/public/index.html index 585838a64..26ebcdec8 100644 --- a/packages/website/public/index.html +++ b/packages/website/public/index.html @@ -17,6 +17,7 @@ + diff --git a/packages/website/ts/@next/constants/globalStyle.tsx b/packages/website/ts/@next/constants/globalStyle.tsx index 6844381c9..bf168d344 100644 --- a/packages/website/ts/@next/constants/globalStyle.tsx +++ b/packages/website/ts/@next/constants/globalStyle.tsx @@ -13,20 +13,6 @@ export interface GlobalStyle { const GlobalStyles = withTheme(createGlobalStyle ` ${cssReset}; - @font-face { - font-family: "Formular"; - src: url("/fonts/Formular-Light.woff2") format("woff2"), url("/fonts/Formular-Light.woff") format("woff"); - font-weight: 300; - font-display: swap; - } - - @font-face { - font-family: "Formular"; - src: url("/fonts/Formular-Regular.woff2") format("woff2"), url("/fonts/Formular-Regular.woff") format("woff"); - font-weight: 400; - font-display: swap; - } - html { font-size: 18px; background-color: ${props => props.theme.bgColor}; -- cgit v1.2.3 From 0c298b7be43998bcd10bcd323920c846ae5693cb Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Mon, 17 Dec 2018 11:48:32 +0100 Subject: Fixes mobile button layout for Definition component --- packages/website/ts/@next/components/button.tsx | 1 + packages/website/ts/@next/components/definition.tsx | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/website/ts/@next/components/button.tsx b/packages/website/ts/@next/components/button.tsx index 05afa3534..ab804b758 100644 --- a/packages/website/ts/@next/components/button.tsx +++ b/packages/website/ts/@next/components/button.tsx @@ -62,6 +62,7 @@ const ButtonBase = styled.button` border-color: ${props => (props.isTransparent && !props.isWithArrow) && 'rgba(255, 255, 255, .4)'}; color: ${props => props.isAccentColor ? props.theme.linkColor : (props.color || props.theme.textColor)}; padding: ${props => (!props.isNoPadding && !props.isWithArrow) && '18px 30px'}; + white-space: ${props => props.isWithArrow && 'nowrap'}; text-align: center; font-size: ${props => props.isWithArrow ? '20px' : '18px'}; text-decoration: none; diff --git a/packages/website/ts/@next/components/definition.tsx b/packages/website/ts/@next/components/definition.tsx index d556bc647..77f837294 100644 --- a/packages/website/ts/@next/components/definition.tsx +++ b/packages/website/ts/@next/components/definition.tsx @@ -116,10 +116,21 @@ const TextWrap = styled.div` `; const LinkWrap = styled.div` - display: inline-flex; margin-top: 60px; - a + a { - margin-left: 60px; + @media (min-width: 768px) { + display: inline-flex; + + a + a { + margin-left: 60px; + } + } + + @media (max-width: 768px) { + max-width: 250px; + + a + a { + margin-top: 15px; + } } `; -- cgit v1.2.3 From 68be8ef861cb906b9007d85f5bc60a42cbaab45a Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Mon, 17 Dec 2018 11:51:35 +0100 Subject: Fix footer link hover states --- packages/website/ts/@next/components/footer.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/@next/components/footer.tsx b/packages/website/ts/@next/components/footer.tsx index 5e5106ff3..155f46979 100644 --- a/packages/website/ts/@next/components/footer.tsx +++ b/packages/website/ts/@next/components/footer.tsx @@ -160,10 +160,10 @@ const Link = styled(ReactRouterLink)` display: block; font-size: 16px; line-height: 20px; - transition: color 0.25s ease-in-out; + transition: opacity 0.25s; text-decoration: none; &:hover { - color: rgba(255, 255, 255, 1); + opacity: 0.8; } `; -- cgit v1.2.3 From d6866a6daeee311daec31b950b28e6d6bb7831e2 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:49:49 +0100 Subject: Adjust thick stroked svgs --- .../icons/illustrations/consistently-ship.svg | 8 ++--- .../ts/@next/icons/illustrations/right-thing.svg | 7 +++- .../supportForAllEthereumStandards.svg | 40 +++++++++++----------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/packages/website/ts/@next/icons/illustrations/consistently-ship.svg b/packages/website/ts/@next/icons/illustrations/consistently-ship.svg index b7b0110be..733655a3f 100644 --- a/packages/website/ts/@next/icons/illustrations/consistently-ship.svg +++ b/packages/website/ts/@next/icons/illustrations/consistently-ship.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/packages/website/ts/@next/icons/illustrations/right-thing.svg b/packages/website/ts/@next/icons/illustrations/right-thing.svg index 4e360c0b4..eba2bbc36 100644 --- a/packages/website/ts/@next/icons/illustrations/right-thing.svg +++ b/packages/website/ts/@next/icons/illustrations/right-thing.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg b/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg index d75302da6..32a4d8602 100755 --- a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg +++ b/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 4611c65aa39b0a76298a611d4f8e1edddaced20d Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 11:49:59 +0100 Subject: Fix wrong icon name --- packages/website/ts/@next/pages/launch_kit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index 02594e38f..d57a44e1b 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -59,7 +59,7 @@ export class NextLaunchKit extends React.Component { title="Networked Liquidity Pool" titleSize="small" description="Tap into and share liquidity with other relayers" - icon="supportForAllEthereumStandards" + icon="networkedLiquidity" iconSize="medium" isInline={true} /> -- cgit v1.2.3 From 6fc80cd7764bec67b68d4a1ecf5d297fb7040e5a Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Mon, 17 Dec 2018 12:04:35 +0100 Subject: Fixes scrollable anchors in why page --- packages/website/package.json | 2 +- packages/website/ts/@next/pages/why.tsx | 99 ++++++++++++++++++--------------- 2 files changed, 55 insertions(+), 46 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index 2eeb1c696..1387f45f4 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -55,7 +55,6 @@ "query-string": "^6.0.0", "rc-slider": "^8.6.3", "react": "^16.4.2", - "react-anchor-link-smooth-scroll": "^1.0.11", "react-copy-to-clipboard": "^5.0.0", "react-document-title": "^2.0.3", "react-dom": "^16.4.2", @@ -68,6 +67,7 @@ "react-redux": "^5.0.3", "react-responsive": "^6.0.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", + "react-scrollable-anchor": "^0.6.1", "react-syntax-highlighter": "^10.1.1", "react-tooltip": "^3.2.7", "react-typist": "^2.0.4", diff --git a/packages/website/ts/@next/pages/why.tsx b/packages/website/ts/@next/pages/why.tsx index a267bd09e..9c3c4d0a2 100644 --- a/packages/website/ts/@next/pages/why.tsx +++ b/packages/website/ts/@next/pages/why.tsx @@ -1,6 +1,7 @@ import * as _ from 'lodash'; import * as React from 'react'; -import AnchorLink from 'react-anchor-link-smooth-scroll'; +import ScrollableAnchor, { configureAnchors } from 'react-scrollable-anchor'; + import styled from 'styled-components'; import {Hero} from 'ts/@next/components/hero'; @@ -79,6 +80,8 @@ const useCaseSlides = [ }, ]; +configureAnchors({ offset: -60 }); + export class NextWhy extends React.Component { public state = { isContactModalOpen: false, @@ -136,57 +139,63 @@ export class NextWhy extends React.Component {
    - Benefits - Use Cases - Features + Benefits + Use Cases + Features - - What 0x offers - - {_.map(offersData, (item, index) => ( - - ))} - - - - Use Cases - - {_.map(useCaseSlides, (item, index) => ( - + + What 0x offers + + {_.map(offersData, (item, index) => ( + + ))} + + + + + + Use Cases + + {_.map(useCaseSlides, (item, index) => ( + + ))} + + + + + + + Exchange Functionality + + {_.map(functionalityData, (item, index) => ( + ))} - - - - - Exchange Functionality - - {_.map(functionalityData, (item, index) => ( - - ))} - + +
    @@ -270,7 +279,7 @@ const NavStickyWrap = styled(WrapSticky)` } `; -const ChapterLink = styled(AnchorLink)` +const ChapterLink = styled.a` color: ${props => props.theme.textColor}; font-size: 22px; margin-bottom: 25px; -- cgit v1.2.3 From 7065a098e3b905784627126e4f64caa85b0980df Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 13:27:00 +0100 Subject: Update og image --- packages/website/public/images/og_image.png | Bin 192500 -> 38784 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/website/public/images/og_image.png b/packages/website/public/images/og_image.png index 74265bdf8..6b8ff5362 100644 Binary files a/packages/website/public/images/og_image.png and b/packages/website/public/images/og_image.png differ -- cgit v1.2.3 From 88240f6401c0a741ae66e63b77c1abe9d22a9037 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 13:31:41 +0100 Subject: Fix liquidity source change --- packages/website/ts/@next/pages/instant/config_generator.tsx | 5 +++-- packages/website/ts/@next/pages/instant/select.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/website/ts/@next/pages/instant/config_generator.tsx b/packages/website/ts/@next/pages/instant/config_generator.tsx index 8857e4fea..4f837d7fa 100644 --- a/packages/website/ts/@next/pages/instant/config_generator.tsx +++ b/packages/website/ts/@next/pages/instant/config_generator.tsx @@ -64,7 +64,7 @@ export class ConfigGenerator extends React.Component - + {this._renderTokenMultiSelectOrSpinner()} @@ -122,7 +122,8 @@ export class ConfigGenerator extends React.Component { window.open(`${WebsitePaths.Wiki}#Learn-About-Affiliate-Fees`, '_blank'); }; - private readonly _handleSRASelection = (sraEndpoint: string) => { + private readonly _handleSRASelection = (event: Event) => { + const sraEndpoint = event.target.value; const newConfig: ZeroExInstantBaseConfig = { ...this.props.value, orderSource: sraEndpoint, diff --git a/packages/website/ts/@next/pages/instant/select.tsx b/packages/website/ts/@next/pages/instant/select.tsx index ae2a07b3d..422818f9f 100644 --- a/packages/website/ts/@next/pages/instant/select.tsx +++ b/packages/website/ts/@next/pages/instant/select.tsx @@ -12,12 +12,13 @@ interface SelectProps { id: string; items: SelectItemConfig[]; emptyText?: string; + onChange?: () => void; } -export const Select: React.FunctionComponent = ({ value, id, items, emptyText }) => { +export const Select: React.FunctionComponent = ({ value, id, items, emptyText, onChange }) => { return ( - + {items.map((item, index) => )} -- cgit v1.2.3 From f242c4206f10df7a66b4eda73b22ac049b816f17 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 13:32:36 +0100 Subject: Update long term impact icon --- .../ts/@next/icons/illustrations/long-term-impact.svg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg b/packages/website/ts/@next/icons/illustrations/long-term-impact.svg index 6e5478b7c..74a44f13d 100644 --- a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg +++ b/packages/website/ts/@next/icons/illustrations/long-term-impact.svg @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + -- cgit v1.2.3 From 8490c31fb7ff788d725b7636cd6bce7b2ae13ac4 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 14:03:14 +0100 Subject: Tweak configurator --- .../ts/@next/icons/illustrations/long-term-impact.svg | 2 +- packages/website/ts/@next/pages/instant/code_demo.tsx | 15 +++++++++++---- packages/website/ts/@next/pages/instant/configurator.tsx | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg b/packages/website/ts/@next/icons/illustrations/long-term-impact.svg index 74a44f13d..dbd051598 100644 --- a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg +++ b/packages/website/ts/@next/icons/illustrations/long-term-impact.svg @@ -6,4 +6,4 @@ -     + \ No newline at end of file diff --git a/packages/website/ts/@next/pages/instant/code_demo.tsx b/packages/website/ts/@next/pages/instant/code_demo.tsx index 35eaf6b2a..04556123e 100644 --- a/packages/website/ts/@next/pages/instant/code_demo.tsx +++ b/packages/website/ts/@next/pages/instant/code_demo.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import * as CopyToClipboard from 'react-copy-to-clipboard'; import SyntaxHighlighter from 'react-syntax-highlighter'; -import { Button } from 'ts/components/ui/button'; +import { Button } from 'ts/@next/components/button'; import { Container } from 'ts/components/ui/container'; import { styled } from 'ts/style/theme'; import { zIndex } from 'ts/style/z_index'; @@ -161,9 +161,9 @@ export class CodeDemo extends React.Component { - + + {copyButtonText} + @@ -176,3 +176,10 @@ export class CodeDemo extends React.Component { this.setState({ didCopyCode: true }); }; } + +const StyledButton = styled(Button)` + border-radius: 4px; + font-size: 15px; + font-weight: 400; + padding: 9px 21px 7px; +`; diff --git a/packages/website/ts/@next/pages/instant/configurator.tsx b/packages/website/ts/@next/pages/instant/configurator.tsx index e4334eabb..007526396 100644 --- a/packages/website/ts/@next/pages/instant/configurator.tsx +++ b/packages/website/ts/@next/pages/instant/configurator.tsx @@ -100,4 +100,8 @@ export class Configurator extends React.Component { const HeadingWrapper = styled.div` display: flex; justify-content: space-between; + + a { + transform: translateY(-8px); + } `; -- cgit v1.2.3 From 19e65965c898f401acf2961f049108141352ce82 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 14:19:10 +0100 Subject: Add market maker page --- packages/website/ts/@next/pages/market_maker.tsx | 127 +++++++++++++++++++++++ packages/website/ts/index.tsx | 2 + packages/website/ts/types.ts | 1 + 3 files changed, 130 insertions(+) create mode 100644 packages/website/ts/@next/pages/market_maker.tsx diff --git a/packages/website/ts/@next/pages/market_maker.tsx b/packages/website/ts/@next/pages/market_maker.tsx new file mode 100644 index 000000000..aa14d4030 --- /dev/null +++ b/packages/website/ts/@next/pages/market_maker.tsx @@ -0,0 +1,127 @@ +import * as _ from 'lodash'; +import * as React from 'react'; + +import {Hero} from 'ts/@next/components/hero'; + +import { Banner } from 'ts/@next/components/banner'; +import { Button } from 'ts/@next/components/button'; +import { Definition } from 'ts/@next/components/definition'; +import { Icon } from 'ts/@next/components/icon'; +import { SiteWrap } from 'ts/@next/components/siteWrap'; + +import { ModalContact } from 'ts/@next/components/modals/modal_contact'; +import {Section} from 'ts/@next/components/newLayout'; + +import { WebsitePaths } from 'ts/types'; + +const offersData = [ + { + icon: 'supportForAllEthereumStandards', + title: 'Comprehensive Tutorials', + description: 'Stay on the bleeding edge of crypto by learning how to market make on decentralized exchanges. The network of 0x relayers provides market makers a first-mover advantage to capture larger spreads, arbitrage markets, and access a long-tail of new tokens not currently listed on centralized exchanges.', + }, + { + icon: 'generateRevenueForYourBusiness-large', + title: 'Market Making Compensation', + description: ( +
      +
    • Receive an infrastructure grant of $20,000+ for completing onboarding
      • +
    • Earn an additional $5,000 by referring other market makers to the Program
      • +
    + ), + }, + { + icon: 'getInTouch', + title: 'Personalized Support', + description: 'The 0x MM Success Manager will walk you through how to read 0x order types, spin up an Ethereum node, set up your MM bot, and execute trades on the blockchain. We are more than happy to promptly answer your questions and give you complete onboarding assistance.', + }, +]; + +export class NextMarketMaker extends React.Component { + public state = { + isContactModalOpen: false, + }; + public render(): React.ReactNode { + return ( + + } + /> + +
    + + + + + +
    + +
    + {_.map(offersData, (item, index) => ( + + ))} +
    + + + +     + ); + } + + public _onOpenContactModal = (): void => { + this.setState({ isContactModalOpen: true }); + } + + public _onDismissContactModal = (): void => { + this.setState({ isContactModalOpen: false }); + } +} + +const HeroActions = () => ( + <> + + +); diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index e9f629c09..ff44946dc 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -30,6 +30,7 @@ import { Next0xInstant } from 'ts/@next/pages/instant'; import { NextLanding } from 'ts/@next/pages/landing'; import { NextLaunchKit } from 'ts/@next/pages/launch_kit'; import { NextWhy } from 'ts/@next/pages/why'; +import { NextMarketMaker } from 'ts/@next/pages/market_maker'; // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries tradeHistoryStorage.clearIfRequired(); @@ -107,6 +108,7 @@ render( + diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 73e248713..064085324 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -359,6 +359,7 @@ export enum WebsitePaths { LaunchKit = '/launch-kit', Instant = '/instant', Ecosystem = '/ecosystem', + MarketMaker = '/market-maker', Why = '/why', Whitepaper = '/pdfs/0x_white_paper.pdf', SmartContracts = '/docs/contracts', -- cgit v1.2.3 From 59325897761c40cd57a30d5ba5c83321a8dbe96a Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 14:20:53 +0100 Subject: Fix cta links --- packages/website/ts/@next/pages/launch_kit.tsx | 2 +- packages/website/ts/@next/pages/market_maker.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index d57a44e1b..bef5d2164 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -100,7 +100,7 @@ export class NextLaunchKit extends React.Component { heading="Need more flexibility?" subline="Dive into our docs, or contact us if needed" mainCta={{ text: 'Get Started', href: '/docs' }} - secondaryCta={{ text: 'Get in Touch', href: this._onOpenContactModal.bind(this) }} + secondaryCta={{ text: 'Get in Touch', onClick: this._onOpenContactModal.bind(this) }} /> diff --git a/packages/website/ts/@next/pages/market_maker.tsx b/packages/website/ts/@next/pages/market_maker.tsx index aa14d4030..f2e49840f 100644 --- a/packages/website/ts/@next/pages/market_maker.tsx +++ b/packages/website/ts/@next/pages/market_maker.tsx @@ -102,7 +102,7 @@ export class NextMarketMaker extends React.Component { heading="Need more flexibility?" subline="Dive into our docs, or contact us if needed" mainCta={{ text: 'Explore the Docs', href: '/docs' }} - secondaryCta={{ text: 'Get in Touch', href: this._onOpenContactModal.bind(this) }} + secondaryCta={{ text: 'Get in Touch', onClick: this._onOpenContactModal.bind(this) }} /> -- cgit v1.2.3 From 934d3b5d798b0cf47e0dcdf36cf9a047bb0efcb8 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 14:32:05 +0100 Subject: Tweak banner border on mobile --- packages/website/ts/@next/components/banner.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/website/ts/@next/components/banner.tsx b/packages/website/ts/@next/components/banner.tsx index e779c5889..df6454c86 100644 --- a/packages/website/ts/@next/components/banner.tsx +++ b/packages/website/ts/@next/components/banner.tsx @@ -137,4 +137,11 @@ const Border = styled.div` top: ${props => !props.isBottom && 0 }; bottom: ${props => props.isBottom && 0 }; transform: translate(-112px); + + @media (max-width: 768px) { + width: calc(100% + 82px); + height: 40px; + transform: translate(-41px); + background-size: auto 80px; + } `; -- cgit v1.2.3 From 3b8598b54ba540699040f9e598ab9cae594a21e8 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Mon, 17 Dec 2018 16:01:06 +0100 Subject: Prepare banner for light theme --- packages/website/ts/@next/components/banner.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/website/ts/@next/components/banner.tsx b/packages/website/ts/@next/components/banner.tsx index df6454c86..2620b92ef 100644 --- a/packages/website/ts/@next/components/banner.tsx +++ b/packages/website/ts/@next/components/banner.tsx @@ -1,6 +1,8 @@ import * as React from 'react'; import styled from 'styled-components'; +import { colors } from 'ts/style/colors'; + import {Button} from 'ts/@next/components/button'; import {ThemeInterface} from 'ts/@next/components/siteWrap'; import {Paragraph} from 'ts/@next/components/text'; @@ -46,7 +48,7 @@ export const Banner: React.StatelessComponent = (props: Props) => { {heading} {subline && - + {subline} } @@ -55,6 +57,7 @@ export const Banner: React.StatelessComponent = (props: Props) => { {mainCta && + + + + + + + + Upcoming Events + + + 0x meetups happen all over the world on a monthly basis and are hosted by devoted members of the community. Want to host a meetup in your city? Reach out for help finding a venue, connecting with local 0x mentors, and promoting your events. + + + + + + + + {_.map(events, (ev: EventProps, index: number) => ( + + ))} + + + + + + + ); + } + + public _onOpenContactModal = (): void => { + this.setState({ isContactModalOpen: true }); + } + + public _onDismissContactModal = (): void => { + this.setState({ isContactModalOpen: false }); + } +} + +const Event: React.FunctionComponent = (event: EventProps) => ( + + + + + {event.title} + + + {event.date} + + + + +); + +// Events +const EventsWrapper = styled(Section)` + display: flex; + align-items: center; + flex-direction: column; +`; + +// Event +const StyledEvent = styled.div` + background-color: ${colors.brandDark}; + width: calc((100% / 3) - 30px); + text-align: left; + height: 424px; + margin-top: 130px; +`; + +const EventImage = styled.img` + width: 100%; + height: 260px; + object-fit: cover; +`; + +const EventContent = styled.div` + padding: 30px 30px; +`; + +// Misc +const LinkWrap = styled.div` + display: inline-flex; + margin-top: 60px; + + a + a { + margin-left: 60px; + } +`; diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index ff44946dc..3e3dced1a 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -25,12 +25,13 @@ import { NextAboutJobs } from 'ts/@next/pages/about/jobs'; import { NextAboutMission } from 'ts/@next/pages/about/mission'; import { NextAboutPress } from 'ts/@next/pages/about/press'; import { NextAboutTeam } from 'ts/@next/pages/about/team'; +import { NextCommunity } from 'ts/@next/pages/community'; import { NextEcosystem } from 'ts/@next/pages/ecosystem'; import { Next0xInstant } from 'ts/@next/pages/instant'; import { NextLanding } from 'ts/@next/pages/landing'; import { NextLaunchKit } from 'ts/@next/pages/launch_kit'; -import { NextWhy } from 'ts/@next/pages/why'; import { NextMarketMaker } from 'ts/@next/pages/market_maker'; +import { NextWhy } from 'ts/@next/pages/why'; // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries tradeHistoryStorage.clearIfRequired(); @@ -108,6 +109,7 @@ render( + diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 064085324..b54ec94b6 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -358,6 +358,7 @@ export enum WebsitePaths { AboutJobs = '/about/jobs', LaunchKit = '/launch-kit', Instant = '/instant', + Community = '/community', Ecosystem = '/ecosystem', MarketMaker = '/market-maker', Why = '/why', -- cgit v1.2.3 From 312d864936a0f930a09dcb0739f0e498ea42feac Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Mon, 17 Dec 2018 17:31:06 +0100 Subject: Fixes mobile nav overflow on mobile --- packages/website/ts/@next/components/header.tsx | 2 +- packages/website/ts/@next/components/siteWrap.tsx | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/@next/components/header.tsx index d5894f65a..f6895d242 100644 --- a/packages/website/ts/@next/components/header.tsx +++ b/packages/website/ts/@next/components/header.tsx @@ -70,7 +70,7 @@ class HeaderBase extends React.Component { const { isNavToggled, toggleMobileNav, theme } = this.props; return ( - + diff --git a/packages/website/ts/@next/components/siteWrap.tsx b/packages/website/ts/@next/components/siteWrap.tsx index c1513c647..6bbe73479 100644 --- a/packages/website/ts/@next/components/siteWrap.tsx +++ b/packages/website/ts/@next/components/siteWrap.tsx @@ -124,7 +124,7 @@ export class SiteWrap extends React.Component { const currentTheme = GLOBAL_THEMES[theme]; return ( - <> + <> @@ -141,11 +141,20 @@ export class SiteWrap extends React.Component {