From 48ab151ec2aaf09f325d1118277ae0d78135de88 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 24 Aug 2018 14:20:55 -0700
Subject: Update react and remove tap event plugin [deprecated]

---
 packages/website/ts/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 981c6f2cb..9e59b00ac 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -3,7 +3,6 @@ import * as React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'react-redux';
 import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom';
-import * as injectTapEventPlugin from 'react-tap-event-plugin';
 import { MetaTags } from 'ts/components/meta_tags';
 import { About } from 'ts/containers/about';
 import { FAQ } from 'ts/containers/faq';
@@ -17,8 +16,6 @@ import { tradeHistoryStorage } from 'ts/local_storage/trade_history_storage';
 import { store } from 'ts/redux/store';
 import { WebsiteLegacyPaths, WebsitePaths } from 'ts/types';
 import { muiTheme } from 'ts/utils/mui_theme';
-// Polyfills
-injectTapEventPlugin();
 
 // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries
 tradeHistoryStorage.clearIfRequired();
-- 
cgit v1.2.3


From ad161a973e5453ec267510f54d88621517254039 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 24 Aug 2018 15:59:14 -0700
Subject: Change all onTouchTap to onClick

---
 packages/website/ts/components/dialogs/blockchain_err_dialog.tsx      | 2 +-
 packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx | 4 ++--
 packages/website/ts/components/dialogs/ledger_config_dialog.tsx       | 2 +-
 packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx   | 2 +-
 packages/website/ts/components/dialogs/send_dialog.tsx                | 4 ++--
 .../website/ts/components/dialogs/track_token_confirmation_dialog.tsx | 4 ++--
 packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx   | 2 +-
 .../ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx       | 2 +-
 packages/website/ts/components/fill_warning_dialog.tsx                | 4 ++--
 packages/website/ts/components/generate_order/asset_picker.tsx        | 4 ++--
 packages/website/ts/components/token_balances.tsx                     | 2 +-
 packages/website/ts/components/top_bar/top_bar.tsx                    | 2 +-
 packages/website/ts/components/ui/lifecycle_raised_button.tsx         | 2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index c8e10303f..18c060991 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -22,7 +22,7 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
                 key="blockchainErrOk"
                 label="Ok"
                 primary={true}
-                onTouchTap={this.props.toggleDialogFn.bind(this.props.toggleDialogFn, false)}
+                onClick={this.props.toggleDialogFn.bind(this.props.toggleDialogFn, false)}
             />,
         ];
 
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index 5f4bf8519..f2cfb279a 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -54,8 +54,8 @@ export class EthWethConversionDialog extends React.Component<
     }
     public render(): React.ReactNode {
         const convertDialogActions = [
-            <FlatButton key="cancel" label="Cancel" onTouchTap={this._onCancel.bind(this)} />,
-            <FlatButton key="convert" label="Convert" primary={true} onTouchTap={this._onConvertClick.bind(this)} />,
+            <FlatButton key="cancel" label="Cancel" onClick={this._onCancel.bind(this)} />,
+            <FlatButton key="convert" label="Convert" primary={true} onClick={this._onConvertClick.bind(this)} />,
         ];
         const title = this.props.direction === Side.Deposit ? 'Wrap ETH' : 'Unwrap WETH';
         return !_.isUndefined(this.props.etherBalanceInWei) ? (
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index d2f373d67..fbc6c868b 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -64,7 +64,7 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
     }
     public render(): React.ReactNode {
         const dialogActions = [
-            <FlatButton key="ledgerConnectCancel" label="Cancel" onTouchTap={this._onClose.bind(this)} />,
+            <FlatButton key="ledgerConnectCancel" label="Cancel" onClick={this._onClose.bind(this)} />,
         ];
         const dialogTitle =
             this.state.stepIndex === LedgerSteps.CONNECT ? 'Connect to your Ledger' : 'Select desired address';
diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index 41a17fe96..ef295762b 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -13,7 +13,7 @@ export const PortalDisclaimerDialog = (props: PortalDisclaimerDialogProps) => {
         <Dialog
             title="0x Portal Disclaimer"
             titleStyle={{ fontWeight: 100 }}
-            actions={[<FlatButton key="portalAgree" label="I Agree" onTouchTap={props.onToggleDialog} />]}
+            actions={[<FlatButton key="portalAgree" label="I Agree" onClick={props.onToggleDialog} />]}
             open={props.isOpen}
             onRequestClose={props.onToggleDialog}
             autoScrollBodyContent={true}
diff --git a/packages/website/ts/components/dialogs/send_dialog.tsx b/packages/website/ts/components/dialogs/send_dialog.tsx
index c1179dbd0..2754b153f 100644
--- a/packages/website/ts/components/dialogs/send_dialog.tsx
+++ b/packages/website/ts/components/dialogs/send_dialog.tsx
@@ -38,13 +38,13 @@ export class SendDialog extends React.Component<SendDialogProps, SendDialogState
     }
     public render(): React.ReactNode {
         const transferDialogActions = [
-            <FlatButton key="cancelTransfer" label="Cancel" onTouchTap={this._onCancel.bind(this)} />,
+            <FlatButton key="cancelTransfer" label="Cancel" onClick={this._onCancel.bind(this)} />,
             <FlatButton
                 key="sendTransfer"
                 disabled={this._hasErrors()}
                 label="Send"
                 primary={true}
-                onTouchTap={this._onSendClick.bind(this)}
+                onClick={this._onSendClick.bind(this)}
             />,
         ];
         return (
diff --git a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
index 3751ce06f..c8d5af6b6 100644
--- a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
+++ b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
@@ -43,12 +43,12 @@ export class TrackTokenConfirmationDialog extends React.Component<
                     <FlatButton
                         key="trackNo"
                         label="No"
-                        onTouchTap={this._onTrackConfirmationRespondedAsync.bind(this, false)}
+                        onClick={this._onTrackConfirmationRespondedAsync.bind(this, false)}
                     />,
                     <FlatButton
                         key="trackYes"
                         label="Yes"
-                        onTouchTap={this._onTrackConfirmationRespondedAsync.bind(this, true)}
+                        onClick={this._onTrackConfirmationRespondedAsync.bind(this, true)}
                     />,
                 ]}
                 open={this.props.isOpen}
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index 3ebab03ef..afbb30b82 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -14,7 +14,7 @@ export const U2fNotSupportedDialog = (props: U2fNotSupportedDialogProps) => {
         <Dialog
             title="U2F Not Supported"
             titleStyle={{ fontWeight: 100 }}
-            actions={[<FlatButton key="u2fNo" label="Ok" onTouchTap={props.onToggleDialog} />]}
+            actions={[<FlatButton key="u2fNo" label="Ok" onClick={props.onToggleDialog} />]}
             open={props.isOpen}
             onRequestClose={props.onToggleDialog}
             autoScrollBodyContent={true}
diff --git a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
index 78b270c1e..cf2c4dda5 100644
--- a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
+++ b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
@@ -14,7 +14,7 @@ export const WrappedEthSectionNoticeDialog = (props: WrappedEthSectionNoticeDial
             title="Dedicated Wrapped Ether Section"
             titleStyle={{ fontWeight: 100 }}
             actions={[
-                <FlatButton key="acknowledgeWrapEthSection" label="Sounds good" onTouchTap={props.onToggleDialog} />,
+                <FlatButton key="acknowledgeWrapEthSection" label="Sounds good" onClick={props.onToggleDialog} />,
             ]}
             open={props.isOpen}
             onRequestClose={props.onToggleDialog}
diff --git a/packages/website/ts/components/fill_warning_dialog.tsx b/packages/website/ts/components/fill_warning_dialog.tsx
index 45c492221..4821aaabe 100644
--- a/packages/website/ts/components/fill_warning_dialog.tsx
+++ b/packages/website/ts/components/fill_warning_dialog.tsx
@@ -18,12 +18,12 @@ export const FillWarningDialog = (props: FillWarningDialogProps) => {
                 <FlatButton
                     key="fillWarningCancel"
                     label="Cancel"
-                    onTouchTap={() => props.onToggleDialog(didCancel)} // tslint:disable-line:jsx-no-lambda
+                    onClick={() => props.onToggleDialog(didCancel)} // tslint:disable-line:jsx-no-lambda
                 />,
                 <FlatButton
                     key="fillWarningContinue"
                     label="Fill Order"
-                    onTouchTap={() => props.onToggleDialog(!didCancel)} // tslint:disable-line:jsx-no-lambda
+                    onClick={() => props.onToggleDialog(!didCancel)} // tslint:disable-line:jsx-no-lambda
                 />,
             ]}
             open={props.isOpen}
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index 2dca3483f..98aad6c62 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -73,12 +73,12 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
                     <FlatButton
                         key="noTracking"
                         label="No"
-                        onTouchTap={this._onTrackConfirmationRespondedAsync.bind(this, false)}
+                        onClick={this._onTrackConfirmationRespondedAsync.bind(this, false)}
                     />,
                     <FlatButton
                         key="yesTrack"
                         label="Yes"
-                        onTouchTap={this._onTrackConfirmationRespondedAsync.bind(this, true)}
+                        onClick={this._onTrackConfirmationRespondedAsync.bind(this, true)}
                     />,
                 ],
             },
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 969ef32ff..7e7a8d1fa 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -165,7 +165,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                 key="errorOkBtn"
                 label="Ok"
                 primary={true}
-                onTouchTap={this._onErrorDialogToggle.bind(this, false)}
+                onClick={this._onErrorDialogToggle.bind(this, false)}
             />,
         ];
         const isTestNetwork = utils.isTestNetwork(this.props.networkId);
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 9ef8211a9..8580c3a6e 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -410,7 +410,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                         <MenuItem className="py2">{this.props.translate.get(Key.Blog, Deco.Cap)}</MenuItem>
                     </a>
                     <Link to={`${WebsitePaths.FAQ}`} className="text-decoration-none">
-                        <MenuItem className="py2" onTouchTap={this._onMenuButtonClick.bind(this)}>
+                        <MenuItem className="py2" onClick={this._onMenuButtonClick.bind(this)}>
                             {this.props.translate.get(Key.Faq, Deco.Cap)}
                         </MenuItem>
                     </Link>
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 380fbc77d..0bb99b9d8 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -71,7 +71,7 @@ export class LifeCycleRaisedButton extends React.Component<LifeCycleRaisedButton
                 style={{ width: '100%' }}
                 backgroundColor={this.props.backgroundColor}
                 labelColor={this.props.labelColor}
-                onTouchTap={this.onClickAsync.bind(this)}
+                onClick={this.onClickAsync.bind(this)}
                 disabled={this.props.isDisabled || this.state.buttonState !== ButtonState.READY}
             />
         );
-- 
cgit v1.2.3


From 91a9014a50cca8e0d42634666fe409839aeae8cf Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 24 Aug 2018 16:48:48 -0700
Subject: Simplify dropdown component

---
 packages/website/ts/components/ui/drop_down.tsx | 40 ++++++++++---------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 4d5caef08..752c92e02 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -25,6 +25,7 @@ export interface DropDownProps {
 
 interface DropDownState {
     isDropDownOpen: boolean;
+    isHovering: boolean;
     anchorEl?: HTMLInputElement;
 }
 
@@ -35,11 +36,21 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         activateEvent: DropdownMouseEvent.Hover,
         closeEvent: DropdownMouseEvent.Hover,
     };
-    private _isHovering: boolean;
     private _popoverCloseCheckIntervalId: number;
+    public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
+        switch (props.activateEvent) {
+            case DropdownMouseEvent.Click:
+                return { isDropDownOpen: state.isDropDownOpen };
+            case DropdownMouseEvent.Hover:
+                return { isDropDownOpen: state.isHovering };
+            default:
+                return {};
+        }
+    }
     constructor(props: DropDownProps) {
         super(props);
         this.state = {
+            isHovering: false,
             isDropDownOpen: false,
         };
     }
@@ -51,15 +62,6 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public componentWillUnmount(): void {
         window.clearInterval(this._popoverCloseCheckIntervalId);
     }
-    public componentWillReceiveProps(_nextProps: DropDownProps): void {
-        // HACK: If the popoverContent is updated to a different dimension and the users
-        // mouse is no longer above it, the dropdown can enter an inconsistent state where
-        // it believes the user is still hovering over it. In order to remedy this, we
-        // call hoverOff whenever the dropdown receives updated props. This is a hack
-        // because it will effectively close the dropdown on any prop update, barring
-        // dropdowns from having dynamic content.
-        this._onHoverOff();
-    }
     public render(): React.ReactNode {
         return (
             <div
@@ -98,28 +100,16 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         }
     }
     private _onHover(event: React.FormEvent<HTMLInputElement>): void {
-        this._isHovering = true;
-        if (this.props.activateEvent === DropdownMouseEvent.Hover) {
-            this._checkIfShouldOpenPopover(event);
-        }
+        this.setState({ isHovering: true });
     }
     private _onHoverOff(): void {
-        this._isHovering = false;
-    }
-    private _checkIfShouldOpenPopover(event: React.FormEvent<HTMLInputElement>): void {
-        if (this.state.isDropDownOpen) {
-            return; // noop
-        }
-        this.setState({
-            isDropDownOpen: true,
-            anchorEl: event.currentTarget,
-        });
+        this.setState({ isHovering: false });
     }
     private _checkIfShouldClosePopover(): void {
         if (!this.state.isDropDownOpen) {
             return; // noop
         }
-        if (this.props.closeEvent === DropdownMouseEvent.Hover && !this._isHovering) {
+        if (this.props.closeEvent === DropdownMouseEvent.Hover && !this.state.isHovering) {
             this._closePopover();
         }
     }
-- 
cgit v1.2.3


From 5785ec0713c39466b3a6a171f5f0a2d38207b44b Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Mon, 27 Aug 2018 18:29:35 -0700
Subject: Have new Popover component working in React 16

---
 .../ts/components/top_bar/provider_display.tsx     |  2 -
 packages/website/ts/components/top_bar/top_bar.tsx |  2 -
 packages/website/ts/components/ui/container.tsx    |  8 +--
 packages/website/ts/components/ui/drop_down.tsx    | 43 ++++++++--------
 packages/website/ts/components/ui/overlay.tsx      |  2 +-
 packages/website/ts/components/ui/popover.tsx      | 59 ++++++++++++++++++++++
 packages/website/ts/components/wallet/wallet.tsx   |  2 -
 packages/website/ts/types.ts                       |  5 --
 8 files changed, 84 insertions(+), 39 deletions(-)
 create mode 100644 packages/website/ts/components/ui/popover.tsx

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index 806eaeea5..0a5c61776 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -61,8 +61,6 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
                 <DropDown
                     activeNode={activeNode}
                     popoverContent={this._renderPopoverContent()}
-                    anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }}
-                    targetOrigin={{ horizontal: 'middle', vertical: 'top' }}
                     zDepth={1}
                 />
             </div>
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 8580c3a6e..3eef17746 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -276,8 +276,6 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                                 <DropDown
                                     activeNode={activeNode}
                                     popoverContent={popoverContent}
-                                    anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }}
-                                    targetOrigin={{ horizontal: 'middle', vertical: 'top' }}
                                     style={styles.menuItem}
                                 />
                                 <TopBarMenuItem
diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index f2ae68b70..cf3ec41f2 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -26,10 +26,10 @@ export interface ContainerProps {
     className?: string;
     position?: 'absolute' | 'fixed' | 'relative' | 'unset';
     display?: 'inline-block' | 'block' | 'inline-flex' | 'inline';
-    top?: string;
-    left?: string;
-    right?: string;
-    bottom?: string;
+    top?: StringOrNum;
+    left?: StringOrNum;
+    right?: StringOrNum;
+    bottom?: StringOrNum;
     zIndex?: number;
     Tag?: ContainerTag;
     cursor?: string;
diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 752c92e02..638b29f88 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -1,6 +1,6 @@
-import Popover from 'material-ui/Popover';
 import * as React from 'react';
-import { MaterialUIPosition } from 'ts/types';
+import { Placement } from 'react-popper';
+import { Popover } from 'ts/components/ui/popover';
 
 const CHECK_CLOSE_POPOVER_INTERVAL_MS = 300;
 const DEFAULT_STYLE = {
@@ -15,8 +15,7 @@ export enum DropdownMouseEvent {
 export interface DropDownProps {
     activeNode: React.ReactNode;
     popoverContent: React.ReactNode;
-    anchorOrigin: MaterialUIPosition;
-    targetOrigin: MaterialUIPosition;
+    placement?: Placement;
     style?: React.CSSProperties;
     zDepth?: number;
     activateEvent?: DropdownMouseEvent;
@@ -33,8 +32,8 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public static defaultProps: Partial<DropDownProps> = {
         style: DEFAULT_STYLE,
         zDepth: 1,
-        activateEvent: DropdownMouseEvent.Hover,
-        closeEvent: DropdownMouseEvent.Hover,
+        activateEvent: DropdownMouseEvent.Click,
+        closeEvent: DropdownMouseEvent.Click,
     };
     private _popoverCloseCheckIntervalId: number;
     public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
@@ -70,24 +69,22 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                 onMouseLeave={this._onHoverOff.bind(this)}
             >
                 <div onClick={this._onActiveNodeClick.bind(this)}>{this.props.activeNode}</div>
-                <Popover
-                    open={this.state.isDropDownOpen}
-                    anchorEl={this.state.anchorEl}
-                    anchorOrigin={this.props.anchorOrigin}
-                    targetOrigin={this.props.targetOrigin}
-                    onRequestClose={this._closePopover.bind(this)}
-                    useLayerForClickAway={this.props.closeEvent === DropdownMouseEvent.Click}
-                    animated={false}
-                    zDepth={this.props.zDepth}
-                >
-                    <div
-                        onMouseEnter={this._onHover.bind(this)}
-                        onMouseLeave={this._onHoverOff.bind(this)}
-                        onClick={this._closePopover.bind(this)}
+                {this.state.isDropDownOpen &&
+                    <Popover
+                        anchorEl={this.state.anchorEl}
+                        placement={this.props.placement}
+                        onRequestClose={this._closePopover.bind(this)}
+                        zIndex={this.props.zDepth}
                     >
-                        {this.props.popoverContent}
-                    </div>
-                </Popover>
+                        <div
+                            onMouseEnter={this._onHover.bind(this)}
+                            onMouseLeave={this._onHoverOff.bind(this)}
+                            onClick={this._closePopover.bind(this)}
+                        >
+                            {this.props.popoverContent}
+                        </div>
+                    </Popover>
+                }
             </div>
         );
     }
diff --git a/packages/website/ts/components/ui/overlay.tsx b/packages/website/ts/components/ui/overlay.tsx
index fc7507475..cb68aeca1 100644
--- a/packages/website/ts/components/ui/overlay.tsx
+++ b/packages/website/ts/components/ui/overlay.tsx
@@ -29,4 +29,4 @@ Overlay.defaultProps = {
     onClick: _.noop.bind(_),
 };
 
-Overlay.displayName = 'Overlay';
+Overlay.displayName = 'Overlay';
\ No newline at end of file
diff --git a/packages/website/ts/components/ui/popover.tsx b/packages/website/ts/components/ui/popover.tsx
new file mode 100644
index 000000000..66c0ac663
--- /dev/null
+++ b/packages/website/ts/components/ui/popover.tsx
@@ -0,0 +1,59 @@
+import * as _ from 'lodash';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Placement, Popper, PopperChildrenProps } from 'react-popper';
+
+import { colors } from '@0xproject/react-shared';
+import { Container } from 'ts/components/ui/container';
+import { Overlay } from 'ts/components/ui/overlay';
+import { styled } from 'ts/style/theme';
+
+export interface PopoverProps {
+    anchorEl: HTMLInputElement;
+    placement?: Placement;
+    onRequestClose?: () => void;
+    zIndex?: number;
+}
+
+const PopoverContainer = styled.div`
+    background-color: ${colors.white};
+    max-height: 679px;
+    overflow-y: auto;
+    border-radius: 2px;
+`;
+
+const defaultPlacement: Placement = 'bottom';
+
+export class Popover extends React.Component<PopoverProps> {
+    public static defaultProps = {
+        placement: defaultPlacement,
+    };
+
+    public render(): React.ReactNode {
+        const { anchorEl, placement, zIndex, onRequestClose } = this.props;
+        const overlayStyleOverrides = {
+            zIndex,
+            backgroundColor: 'transparent',
+        };
+        return (
+            <div>
+                <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/>
+                <Popper referenceElement={anchorEl} placement="bottom" eventsEnabled={true}>
+                    {this._renderPopperChildren.bind(this)}
+                </Popper>
+            </div>
+        );
+    }
+    private _renderPopperChildren(props: PopperChildrenProps): React.ReactNode {
+        const popperContainerStyleOverrids = {
+            zIndex: _.isUndefined(this.props.zIndex) ? undefined : this.props.zIndex + 1,
+        };
+        return (
+            <div ref={props.ref} style={{...props.style, ...popperContainerStyleOverrids}}>
+                <PopoverContainer>
+                    {this.props.children}
+                </PopoverContainer>
+            </div>
+        );
+    }
+}
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 6abaa840b..968377010 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -234,8 +234,6 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
                         {!isMobile && <GoToAccountManagementSimpleMenuItem />}
                     </SimpleMenu>
                 }
-                anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
-                targetOrigin={{ horizontal: 'right', vertical: 'top' }}
                 zDepth={1}
                 activateEvent={DropdownMouseEvent.Click}
                 closeEvent={DropdownMouseEvent.Click}
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index c637171dd..e76fae932 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -492,11 +492,6 @@ export enum Deco {
     Upper,
 }
 
-export interface MaterialUIPosition {
-    vertical: 'bottom' | 'top' | 'center';
-    horizontal: 'left' | 'middle' | 'right';
-}
-
 export enum Providers {
     Parity = 'PARITY',
     Metamask = 'METAMASK',
-- 
cgit v1.2.3


From ac1640140c9279ac9e8a92d84702a2f84d9165fb Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 28 Aug 2018 13:53:49 -0700
Subject: Enable hovering state for dropdown

---
 packages/website/ts/components/ui/drop_down.tsx  | 13 +++++++------
 packages/website/ts/components/ui/popover.tsx    |  3 ++-
 packages/website/ts/components/wallet/wallet.tsx |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 638b29f88..32105d353 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -32,8 +32,8 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public static defaultProps: Partial<DropDownProps> = {
         style: DEFAULT_STYLE,
         zDepth: 1,
-        activateEvent: DropdownMouseEvent.Click,
-        closeEvent: DropdownMouseEvent.Click,
+        activateEvent: DropdownMouseEvent.Hover,
+        closeEvent: DropdownMouseEvent.Hover,
     };
     private _popoverCloseCheckIntervalId: number;
     public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
@@ -77,8 +77,6 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                         zIndex={this.props.zDepth}
                     >
                         <div
-                            onMouseEnter={this._onHover.bind(this)}
-                            onMouseLeave={this._onHoverOff.bind(this)}
                             onClick={this._closePopover.bind(this)}
                         >
                             {this.props.popoverContent}
@@ -97,10 +95,13 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         }
     }
     private _onHover(event: React.FormEvent<HTMLInputElement>): void {
-        this.setState({ isHovering: true });
+        this.setState({
+            isHovering: true,
+            anchorEl: event.currentTarget,
+        });
     }
     private _onHoverOff(): void {
-        this.setState({ isHovering: false });
+        this.setState({ isHovering: false, anchorEl: undefined });
     }
     private _checkIfShouldClosePopover(): void {
         if (!this.state.isDropDownOpen) {
diff --git a/packages/website/ts/components/ui/popover.tsx b/packages/website/ts/components/ui/popover.tsx
index 66c0ac663..556e8b110 100644
--- a/packages/website/ts/components/ui/popover.tsx
+++ b/packages/website/ts/components/ui/popover.tsx
@@ -20,6 +20,7 @@ const PopoverContainer = styled.div`
     max-height: 679px;
     overflow-y: auto;
     border-radius: 2px;
+    box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 6px, rgba(0, 0, 0, 0.12) 0px 1px 4px;
 `;
 
 const defaultPlacement: Placement = 'bottom';
@@ -37,7 +38,7 @@ export class Popover extends React.Component<PopoverProps> {
         };
         return (
             <div>
-                <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/>
+                {/* <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/> */}
                 <Popper referenceElement={anchorEl} placement="bottom" eventsEnabled={true}>
                     {this._renderPopperChildren.bind(this)}
                 </Popper>
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 968377010..191f3a18a 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -235,6 +235,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
                     </SimpleMenu>
                 }
                 zDepth={1}
+                placement="right-end"
                 activateEvent={DropdownMouseEvent.Click}
                 closeEvent={DropdownMouseEvent.Click}
             />
-- 
cgit v1.2.3


From 8e14e65b60bc4b94ba686c7bb5467bb4a5e2c645 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 28 Aug 2018 15:07:24 -0700
Subject: Revert "Enable hovering state for dropdown"

This reverts commit ac1640140c9279ac9e8a92d84702a2f84d9165fb.
---
 packages/website/ts/components/ui/drop_down.tsx  | 13 ++++++-------
 packages/website/ts/components/ui/popover.tsx    |  3 +--
 packages/website/ts/components/wallet/wallet.tsx |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 32105d353..638b29f88 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -32,8 +32,8 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public static defaultProps: Partial<DropDownProps> = {
         style: DEFAULT_STYLE,
         zDepth: 1,
-        activateEvent: DropdownMouseEvent.Hover,
-        closeEvent: DropdownMouseEvent.Hover,
+        activateEvent: DropdownMouseEvent.Click,
+        closeEvent: DropdownMouseEvent.Click,
     };
     private _popoverCloseCheckIntervalId: number;
     public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
@@ -77,6 +77,8 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                         zIndex={this.props.zDepth}
                     >
                         <div
+                            onMouseEnter={this._onHover.bind(this)}
+                            onMouseLeave={this._onHoverOff.bind(this)}
                             onClick={this._closePopover.bind(this)}
                         >
                             {this.props.popoverContent}
@@ -95,13 +97,10 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         }
     }
     private _onHover(event: React.FormEvent<HTMLInputElement>): void {
-        this.setState({
-            isHovering: true,
-            anchorEl: event.currentTarget,
-        });
+        this.setState({ isHovering: true });
     }
     private _onHoverOff(): void {
-        this.setState({ isHovering: false, anchorEl: undefined });
+        this.setState({ isHovering: false });
     }
     private _checkIfShouldClosePopover(): void {
         if (!this.state.isDropDownOpen) {
diff --git a/packages/website/ts/components/ui/popover.tsx b/packages/website/ts/components/ui/popover.tsx
index 556e8b110..66c0ac663 100644
--- a/packages/website/ts/components/ui/popover.tsx
+++ b/packages/website/ts/components/ui/popover.tsx
@@ -20,7 +20,6 @@ const PopoverContainer = styled.div`
     max-height: 679px;
     overflow-y: auto;
     border-radius: 2px;
-    box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 6px, rgba(0, 0, 0, 0.12) 0px 1px 4px;
 `;
 
 const defaultPlacement: Placement = 'bottom';
@@ -38,7 +37,7 @@ export class Popover extends React.Component<PopoverProps> {
         };
         return (
             <div>
-                {/* <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/> */}
+                <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/>
                 <Popper referenceElement={anchorEl} placement="bottom" eventsEnabled={true}>
                     {this._renderPopperChildren.bind(this)}
                 </Popper>
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 191f3a18a..968377010 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -235,7 +235,6 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
                     </SimpleMenu>
                 }
                 zDepth={1}
-                placement="right-end"
                 activateEvent={DropdownMouseEvent.Click}
                 closeEvent={DropdownMouseEvent.Click}
             />
-- 
cgit v1.2.3


From de11b62e30270ec72ad42c510989b5698339e590 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 28 Aug 2018 15:07:28 -0700
Subject: Revert "Have new Popover component working in React 16"

This reverts commit 5785ec0713c39466b3a6a171f5f0a2d38207b44b.
---
 .../ts/components/top_bar/provider_display.tsx     |  2 +
 packages/website/ts/components/top_bar/top_bar.tsx |  2 +
 packages/website/ts/components/ui/container.tsx    |  8 +--
 packages/website/ts/components/ui/drop_down.tsx    | 43 ++++++++--------
 packages/website/ts/components/ui/overlay.tsx      |  2 +-
 packages/website/ts/components/ui/popover.tsx      | 59 ----------------------
 packages/website/ts/components/wallet/wallet.tsx   |  2 +
 packages/website/ts/types.ts                       |  5 ++
 8 files changed, 39 insertions(+), 84 deletions(-)
 delete mode 100644 packages/website/ts/components/ui/popover.tsx

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index 0a5c61776..806eaeea5 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -61,6 +61,8 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
                 <DropDown
                     activeNode={activeNode}
                     popoverContent={this._renderPopoverContent()}
+                    anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }}
+                    targetOrigin={{ horizontal: 'middle', vertical: 'top' }}
                     zDepth={1}
                 />
             </div>
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 3eef17746..8580c3a6e 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -276,6 +276,8 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                                 <DropDown
                                     activeNode={activeNode}
                                     popoverContent={popoverContent}
+                                    anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }}
+                                    targetOrigin={{ horizontal: 'middle', vertical: 'top' }}
                                     style={styles.menuItem}
                                 />
                                 <TopBarMenuItem
diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index cf3ec41f2..f2ae68b70 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -26,10 +26,10 @@ export interface ContainerProps {
     className?: string;
     position?: 'absolute' | 'fixed' | 'relative' | 'unset';
     display?: 'inline-block' | 'block' | 'inline-flex' | 'inline';
-    top?: StringOrNum;
-    left?: StringOrNum;
-    right?: StringOrNum;
-    bottom?: StringOrNum;
+    top?: string;
+    left?: string;
+    right?: string;
+    bottom?: string;
     zIndex?: number;
     Tag?: ContainerTag;
     cursor?: string;
diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 638b29f88..752c92e02 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -1,6 +1,6 @@
+import Popover from 'material-ui/Popover';
 import * as React from 'react';
-import { Placement } from 'react-popper';
-import { Popover } from 'ts/components/ui/popover';
+import { MaterialUIPosition } from 'ts/types';
 
 const CHECK_CLOSE_POPOVER_INTERVAL_MS = 300;
 const DEFAULT_STYLE = {
@@ -15,7 +15,8 @@ export enum DropdownMouseEvent {
 export interface DropDownProps {
     activeNode: React.ReactNode;
     popoverContent: React.ReactNode;
-    placement?: Placement;
+    anchorOrigin: MaterialUIPosition;
+    targetOrigin: MaterialUIPosition;
     style?: React.CSSProperties;
     zDepth?: number;
     activateEvent?: DropdownMouseEvent;
@@ -32,8 +33,8 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public static defaultProps: Partial<DropDownProps> = {
         style: DEFAULT_STYLE,
         zDepth: 1,
-        activateEvent: DropdownMouseEvent.Click,
-        closeEvent: DropdownMouseEvent.Click,
+        activateEvent: DropdownMouseEvent.Hover,
+        closeEvent: DropdownMouseEvent.Hover,
     };
     private _popoverCloseCheckIntervalId: number;
     public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
@@ -69,22 +70,24 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                 onMouseLeave={this._onHoverOff.bind(this)}
             >
                 <div onClick={this._onActiveNodeClick.bind(this)}>{this.props.activeNode}</div>
-                {this.state.isDropDownOpen &&
-                    <Popover
-                        anchorEl={this.state.anchorEl}
-                        placement={this.props.placement}
-                        onRequestClose={this._closePopover.bind(this)}
-                        zIndex={this.props.zDepth}
+                <Popover
+                    open={this.state.isDropDownOpen}
+                    anchorEl={this.state.anchorEl}
+                    anchorOrigin={this.props.anchorOrigin}
+                    targetOrigin={this.props.targetOrigin}
+                    onRequestClose={this._closePopover.bind(this)}
+                    useLayerForClickAway={this.props.closeEvent === DropdownMouseEvent.Click}
+                    animated={false}
+                    zDepth={this.props.zDepth}
+                >
+                    <div
+                        onMouseEnter={this._onHover.bind(this)}
+                        onMouseLeave={this._onHoverOff.bind(this)}
+                        onClick={this._closePopover.bind(this)}
                     >
-                        <div
-                            onMouseEnter={this._onHover.bind(this)}
-                            onMouseLeave={this._onHoverOff.bind(this)}
-                            onClick={this._closePopover.bind(this)}
-                        >
-                            {this.props.popoverContent}
-                        </div>
-                    </Popover>
-                }
+                        {this.props.popoverContent}
+                    </div>
+                </Popover>
             </div>
         );
     }
diff --git a/packages/website/ts/components/ui/overlay.tsx b/packages/website/ts/components/ui/overlay.tsx
index cb68aeca1..fc7507475 100644
--- a/packages/website/ts/components/ui/overlay.tsx
+++ b/packages/website/ts/components/ui/overlay.tsx
@@ -29,4 +29,4 @@ Overlay.defaultProps = {
     onClick: _.noop.bind(_),
 };
 
-Overlay.displayName = 'Overlay';
\ No newline at end of file
+Overlay.displayName = 'Overlay';
diff --git a/packages/website/ts/components/ui/popover.tsx b/packages/website/ts/components/ui/popover.tsx
deleted file mode 100644
index 66c0ac663..000000000
--- a/packages/website/ts/components/ui/popover.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as _ from 'lodash';
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import { Placement, Popper, PopperChildrenProps } from 'react-popper';
-
-import { colors } from '@0xproject/react-shared';
-import { Container } from 'ts/components/ui/container';
-import { Overlay } from 'ts/components/ui/overlay';
-import { styled } from 'ts/style/theme';
-
-export interface PopoverProps {
-    anchorEl: HTMLInputElement;
-    placement?: Placement;
-    onRequestClose?: () => void;
-    zIndex?: number;
-}
-
-const PopoverContainer = styled.div`
-    background-color: ${colors.white};
-    max-height: 679px;
-    overflow-y: auto;
-    border-radius: 2px;
-`;
-
-const defaultPlacement: Placement = 'bottom';
-
-export class Popover extends React.Component<PopoverProps> {
-    public static defaultProps = {
-        placement: defaultPlacement,
-    };
-
-    public render(): React.ReactNode {
-        const { anchorEl, placement, zIndex, onRequestClose } = this.props;
-        const overlayStyleOverrides = {
-            zIndex,
-            backgroundColor: 'transparent',
-        };
-        return (
-            <div>
-                <Overlay onClick={onRequestClose} style={overlayStyleOverrides}/>
-                <Popper referenceElement={anchorEl} placement="bottom" eventsEnabled={true}>
-                    {this._renderPopperChildren.bind(this)}
-                </Popper>
-            </div>
-        );
-    }
-    private _renderPopperChildren(props: PopperChildrenProps): React.ReactNode {
-        const popperContainerStyleOverrids = {
-            zIndex: _.isUndefined(this.props.zIndex) ? undefined : this.props.zIndex + 1,
-        };
-        return (
-            <div ref={props.ref} style={{...props.style, ...popperContainerStyleOverrids}}>
-                <PopoverContainer>
-                    {this.props.children}
-                </PopoverContainer>
-            </div>
-        );
-    }
-}
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 968377010..6abaa840b 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -234,6 +234,8 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
                         {!isMobile && <GoToAccountManagementSimpleMenuItem />}
                     </SimpleMenu>
                 }
+                anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
+                targetOrigin={{ horizontal: 'right', vertical: 'top' }}
                 zDepth={1}
                 activateEvent={DropdownMouseEvent.Click}
                 closeEvent={DropdownMouseEvent.Click}
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index e76fae932..c637171dd 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -492,6 +492,11 @@ export enum Deco {
     Upper,
 }
 
+export interface MaterialUIPosition {
+    vertical: 'bottom' | 'top' | 'center';
+    horizontal: 'left' | 'middle' | 'right';
+}
+
 export enum Providers {
     Parity = 'PARITY',
     Metamask = 'METAMASK',
-- 
cgit v1.2.3


From 55fab3d98f8714d09906745922b59afbdc0de00d Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 28 Aug 2018 15:07:29 -0700
Subject: Revert "Simplify dropdown component"

This reverts commit 91a9014a50cca8e0d42634666fe409839aeae8cf.
---
 packages/website/ts/components/ui/drop_down.tsx | 40 +++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 752c92e02..4d5caef08 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -25,7 +25,6 @@ export interface DropDownProps {
 
 interface DropDownState {
     isDropDownOpen: boolean;
-    isHovering: boolean;
     anchorEl?: HTMLInputElement;
 }
 
@@ -36,21 +35,11 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         activateEvent: DropdownMouseEvent.Hover,
         closeEvent: DropdownMouseEvent.Hover,
     };
+    private _isHovering: boolean;
     private _popoverCloseCheckIntervalId: number;
-    public static getDerivedStateFromProps(props: DropDownProps, state: DropDownState): Partial<DropDownState> {
-        switch (props.activateEvent) {
-            case DropdownMouseEvent.Click:
-                return { isDropDownOpen: state.isDropDownOpen };
-            case DropdownMouseEvent.Hover:
-                return { isDropDownOpen: state.isHovering };
-            default:
-                return {};
-        }
-    }
     constructor(props: DropDownProps) {
         super(props);
         this.state = {
-            isHovering: false,
             isDropDownOpen: false,
         };
     }
@@ -62,6 +51,15 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     public componentWillUnmount(): void {
         window.clearInterval(this._popoverCloseCheckIntervalId);
     }
+    public componentWillReceiveProps(_nextProps: DropDownProps): void {
+        // HACK: If the popoverContent is updated to a different dimension and the users
+        // mouse is no longer above it, the dropdown can enter an inconsistent state where
+        // it believes the user is still hovering over it. In order to remedy this, we
+        // call hoverOff whenever the dropdown receives updated props. This is a hack
+        // because it will effectively close the dropdown on any prop update, barring
+        // dropdowns from having dynamic content.
+        this._onHoverOff();
+    }
     public render(): React.ReactNode {
         return (
             <div
@@ -100,16 +98,28 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         }
     }
     private _onHover(event: React.FormEvent<HTMLInputElement>): void {
-        this.setState({ isHovering: true });
+        this._isHovering = true;
+        if (this.props.activateEvent === DropdownMouseEvent.Hover) {
+            this._checkIfShouldOpenPopover(event);
+        }
     }
     private _onHoverOff(): void {
-        this.setState({ isHovering: false });
+        this._isHovering = false;
+    }
+    private _checkIfShouldOpenPopover(event: React.FormEvent<HTMLInputElement>): void {
+        if (this.state.isDropDownOpen) {
+            return; // noop
+        }
+        this.setState({
+            isDropDownOpen: true,
+            anchorEl: event.currentTarget,
+        });
     }
     private _checkIfShouldClosePopover(): void {
         if (!this.state.isDropDownOpen) {
             return; // noop
         }
-        if (this.props.closeEvent === DropdownMouseEvent.Hover && !this.state.isHovering) {
+        if (this.props.closeEvent === DropdownMouseEvent.Hover && !this._isHovering) {
             this._closePopover();
         }
     }
-- 
cgit v1.2.3


From b9f7979e91790615c3f1e45c7a3d29d6369e8092 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 28 Aug 2018 21:01:26 -0700
Subject: Replace projects section with relayers

---
 packages/website/ts/pages/landing/landing.tsx | 82 ++-------------------------
 1 file changed, 5 insertions(+), 77 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 78f5fc3c1..5b5bd753c 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -42,73 +42,6 @@ const THROTTLE_TIMEOUT = 100;
 const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018';
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
 
-const relayersAndDappProjects: Project[] = [
-    {
-        logoFileName: 'ercdex.png',
-        projectUrl: constants.PROJECT_URL_ERC_DEX,
-    },
-    {
-        logoFileName: 'radar_relay.png',
-        projectUrl: constants.PROJECT_URL_RADAR_RELAY,
-    },
-    {
-        logoFileName: 'paradex.png',
-        projectUrl: constants.PROJECT_URL_PARADEX,
-    },
-    {
-        logoFileName: 'the_ocean.png',
-        projectUrl: constants.PROJECT_URL_0CEAN,
-    },
-    {
-        logoFileName: 'dydx.png',
-        projectUrl: constants.PROJECT_URL_DYDX,
-    },
-    {
-        logoFileName: 'ethfinex.png',
-        projectUrl: constants.PROJECT_URL_ETHFINEX,
-    },
-    {
-        logoFileName: 'melonport.png',
-        projectUrl: constants.PROJECT_URL_MELONPORT,
-    },
-    {
-        logoFileName: 'maker.png',
-        projectUrl: constants.PROJECT_URL_MAKER,
-    },
-    {
-        logoFileName: 'dharma.png',
-        projectUrl: constants.PROJECT_URL_DHARMA,
-    },
-    {
-        logoFileName: 'lendroid.png',
-        projectUrl: constants.PROJECT_URL_LENDROID,
-    },
-    {
-        logoFileName: 'district0x.png',
-        projectUrl: constants.PROJECT_URL_DISTRICT_0X,
-    },
-    {
-        logoFileName: 'aragon.png',
-        projectUrl: constants.PROJECT_URL_ARAGON,
-    },
-    {
-        logoFileName: 'blocknet.png',
-        projectUrl: constants.PROJECT_URL_BLOCKNET,
-    },
-    {
-        logoFileName: 'imtoken.png',
-        projectUrl: constants.PROJECT_URL_IMTOKEN,
-    },
-    {
-        logoFileName: 'augur.png',
-        projectUrl: constants.PROJECT_URL_AUGUR,
-    },
-    {
-        logoFileName: 'anx.png',
-        projectUrl: constants.PROJECT_URL_OPEN_ANX,
-    },
-];
-
 const relayerProjects: Project[] = [
     {
         logoFileName: 'ethfinex.png',
@@ -198,20 +131,15 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     translate={this.props.translate}
                 />
                 {this._renderHero()}
-                {this._renderProjects(
-                    relayersAndDappProjects,
-                    this.props.translate.get(Key.ProjectsHeader, Deco.Upper),
-                    colors.projectsGrey,
-                    false,
-                )}
-                {this._renderTokenizationSection()}
-                {this._renderProtocolSection()}
                 {this._renderProjects(
                     relayerProjects,
                     this.props.translate.get(Key.RelayersHeader, Deco.Upper),
-                    colors.heroGrey,
+                    colors.projectsGrey,
                     true,
                 )}
+                {this._renderTokenizationSection()}
+                {this._renderProtocolSection()}
+
                 {this._renderInfoBoxes()}
                 {this._renderBuildingBlocksSection()}
                 {this._renderUseCases()}
@@ -368,7 +296,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     >
                         {this.props.translate.get(Key.FullListPrompt)}{' '}
                         <Link
-                            to={`${WebsitePaths.Wiki}#List-of-Projects-Using-0x-Protocol`}
+                            to={WebsitePaths.Portal}
                             className="text-decoration-none underline"
                             style={{ color: colors.landingLinkGrey }}
                         >
-- 
cgit v1.2.3


From 557267477e10902e801e18733d551f13c402a6cd Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 28 Aug 2018 22:00:23 -0700
Subject: Add new header image

---
 packages/website/ts/pages/landing/landing.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 5b5bd753c..4833fa8f3 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -151,14 +151,15 @@ export class Landing extends React.Component<LandingProps, LandingState> {
     private _renderHero(): React.ReactNode {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const left = 'col lg-col-7 md-col-7 col-12 lg-pl4 md-pl4 sm-pl0 sm-px3 sm-center';
+        const flexClassName = isSmallScreen ? 'flex items-center flex-column' : 'flex items-center';
         return (
             <div className="clearfix py4" style={{ backgroundColor: colors.heroGrey }}>
                 <div className="mx-auto max-width-4 clearfix">
                     {this._renderWhatsNew()}
-                    <div className="lg-pt4 md-pt4 sm-pt2 lg-pb4 md-pb4 lg-mt4 md-mt4 sm-mt2 sm-mb4 clearfix">
-                        <div className="col lg-col-5 md-col-5 col-12 sm-center">
-                            <img src="/images/landing/hero_chip_image.png" height={isSmallScreen ? 300 : 395} />
-                        </div>
+                    <div className={`${flexClassName} lg-pt4 md-pt4 sm-pt2 lg-pb4 md-pb4 lg-mt4 md-mt4 sm-mt2 sm-mb4`}>
+                        <Container marginTop="30px" marginBottom="30px">
+                            <img src="/images/landing/0x_homepage.svg" height="250px" />
+                        </Container>
                         <div className={left} style={{ color: colors.white, height: 390, lineHeight: '390px' }}>
                             <div
                                 className="inline-block lg-align-middle md-align-middle sm-align-top"
-- 
cgit v1.2.3


From d93d4c34f5372147fc295572a2f0acf3bd9baa55 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 28 Aug 2018 22:34:11 -0700
Subject: Update whats new

---
 packages/website/ts/pages/landing/landing.tsx | 32 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 4833fa8f3..1cc2ee5c0 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -8,6 +8,7 @@ import { SubscribeForm } from 'ts/components/forms/subscribe_form';
 import { TopBar } from 'ts/components/top_bar/top_bar';
 import { CallToAction } from 'ts/components/ui/button';
 import { Container } from 'ts/components/ui/container';
+import { Text } from 'ts/components/ui/text';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { Deco, Key, Language, ScreenWidths, WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
@@ -39,7 +40,7 @@ interface Project {
 }
 
 const THROTTLE_TIMEOUT = 100;
-const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018';
+const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
 
 const relayerProjects: Project[] = [
@@ -216,19 +217,24 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div className="sm-center sm-px1">
                 <a href={WHATS_NEW_URL} target="_blank" className="inline-block text-decoration-none">
-                    <div className="flex sm-pl0 md-pl2 lg-pl0" style={{ fontFamily: 'Roboto Mono', fontWeight: 600 }}>
-                        <div
-                            className="mr1 px1"
-                            style={{
-                                backgroundColor: colors.white,
-                                borderRadius: 3,
-                                color: colors.heroGrey,
-                                height: 23,
-                            }}
+                    <div className="flex items-center sm-pl0 md-pl2 lg-pl0">
+                        <Container
+                            paddingTop="5px"
+                            paddingLeft="8px"
+                            paddingBottom="5px"
+                            paddingRight="8px"
+                            backgroundColor={colors.white}
+                            borderRadius={6}
                         >
-                            New
-                        </div>
-                        <div style={{ color: colors.darkGrey }}>{WHATS_NEW_TITLE}</div>
+                            <Text fontSize="16px" fontWeight={500} fontColor={colors.heroGrey}>
+                                New
+                            </Text>
+                        </Container>
+                        <Container marginLeft="12px">
+                            <Text fontSize="18px" fontWeight={500} fontColor={colors.white}>
+                                {WHATS_NEW_TITLE}
+                            </Text>
+                        </Container>
                     </div>
                 </a>
             </div>
-- 
cgit v1.2.3


From 6924a2b681b8f6d6c154499f3e5d7879524f89c1 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 29 Aug 2018 10:38:15 -0700
Subject: Update benefits

---
 packages/website/ts/pages/landing/landing.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 1cc2ee5c0..83484409d 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -138,10 +138,8 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     colors.projectsGrey,
                     true,
                 )}
-                {this._renderTokenizationSection()}
-                {this._renderProtocolSection()}
-
                 {this._renderInfoBoxes()}
+                {this._renderTokenizationSection()}
                 {this._renderBuildingBlocksSection()}
                 {this._renderUseCases()}
                 {this._renderCallToAction()}
-- 
cgit v1.2.3


From 3bc9b309f6ea1889d775da88a06d9ba8b3a67bc9 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 29 Aug 2018 11:26:22 -0700
Subject: Update tokenization section

---
 packages/website/ts/pages/landing/landing.tsx | 54 ++++++---------------------
 packages/website/ts/types.ts                  |  1 +
 2 files changed, 12 insertions(+), 43 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 83484409d..08da4da8f 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -335,7 +335,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                             >
                                 {this.props.translate.get(Key.TokenizedSectionDescription, Deco.Cap)}
                             </div>
-                            <div className="flex pt1 sm-px3">{this._renderAssetTypes()}</div>
+                            <div className="flex pt1 sm-px3">{this._renderMissionAndValuesButton()}</div>
                         </div>
                     </div>
                     {!isSmallScreen && this._renderTokenCloud()}
@@ -461,48 +461,16 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             </div>
         );
     }
-    private _renderAssetTypes(): React.ReactNode {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-        const assetTypes: AssetType[] = [
-            {
-                title: this.props.translate.get(Key.Currency, Deco.Cap),
-                imageUrl: '/images/landing/currency.png',
-            },
-            {
-                title: this.props.translate.get(Key.TraditionalAssets, Deco.Cap),
-                imageUrl: '/images/landing/stocks.png',
-                style: {
-                    paddingLeft: isSmallScreen ? 41 : 56,
-                    paddingRight: isSmallScreen ? 41 : 56,
-                },
-            },
-            {
-                title: this.props.translate.get(Key.DigitalGoods, Deco.Cap),
-                imageUrl: '/images/landing/digital_goods.png',
-            },
-        ];
-        const assets = _.map(assetTypes, (assetType: AssetType) => {
-            const style = _.isUndefined(assetType.style) ? {} : assetType.style;
-            return (
-                <div key={`asset-${assetType.title}`} className="center" style={{ opacity: 0.8, ...style }}>
-                    <div>
-                        <img src={assetType.imageUrl} height="80" />
-                    </div>
-                    <div
-                        style={{
-                            fontFamily: 'Roboto Mono',
-                            fontSize: 13.5,
-                            fontWeight: 400,
-                            color: colors.darkestGrey,
-                            lineHeight: 1.4,
-                        }}
-                    >
-                        {assetType.title}
-                    </div>
-                </div>
-            );
-        });
-        return assets;
+    private _renderMissionAndValuesButton(): React.ReactNode {
+        return (
+            <a
+                href={constants.URL_MISSION_AND_VALUES_BLOG_POST}
+                target="_blank"
+                className="inline-block text-decoration-none"
+            >
+                <CallToAction>{this.props.translate.get(Key.OurMissionAndValues, Deco.CapWords)}</CallToAction>
+            </a>
+        );
     }
     private _renderInfoBoxes(): React.ReactNode {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index c637171dd..398a8da11 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -468,6 +468,7 @@ export enum Key {
     Home = 'HOME',
     RocketChat = 'ROCKETCHAT',
     TradeCallToAction = 'TRADE_CALL_TO_ACTION',
+    OurMissionAndValues = 'OUR_MISSION_AND_VALUES',
 }
 
 export enum SmartContractDocSections {
-- 
cgit v1.2.3


From b1c5f6e8f175aab891b735ed0b4382a787cbbd9b Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 29 Aug 2018 12:41:25 -0700
Subject: Update use cases section

---
 packages/website/ts/pages/landing/landing.tsx | 133 ++++++++++++++++----------
 packages/website/ts/types.ts                  |   4 +
 2 files changed, 89 insertions(+), 48 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 08da4da8f..68984896e 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -32,7 +32,6 @@ interface UseCase {
     description: string;
     classNames: string;
     style?: React.CSSProperties;
-    projectIconUrls: string[];
 }
 interface Project {
     logoFileName: string;
@@ -140,7 +139,6 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 )}
                 {this._renderInfoBoxes()}
                 {this._renderTokenizationSection()}
-                {this._renderBuildingBlocksSection()}
                 {this._renderUseCases()}
                 {this._renderCallToAction()}
                 <Footer translate={this.props.translate} dispatcher={this.props.dispatcher} />
@@ -535,53 +533,92 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             </div>
         );
     }
-    private _renderUseCases(): React.ReactNode {
+    private _getUseCases(): UseCase[] {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-
-        const useCases: UseCase[] = [
-            {
-                imageUrl: '/images/landing/governance_icon.png',
-                type: this.props.translate.get(Key.DecentralizedGovernance, Deco.Upper),
-                description: this.props.translate.get(Key.DecentralizedGovernanceDescription, Deco.Cap),
-                projectIconUrls: ['/images/landing/aragon.png'],
-                classNames: 'lg-px2 md-px2',
-            },
-            {
-                imageUrl: '/images/landing/prediction_market_icon.png',
-                type: this.props.translate.get(Key.PredictionMarkets, Deco.Upper),
-                description: this.props.translate.get(Key.PredictionMarketsDescription, Deco.Cap),
-                projectIconUrls: ['/images/landing/augur.png'],
-                classNames: 'lg-px2 md-px2',
-            },
-            {
-                imageUrl: '/images/landing/stable_tokens_icon.png',
-                type: this.props.translate.get(Key.StableTokens, Deco.Upper),
-                description: this.props.translate.get(Key.StableTokensDescription, Deco.Cap),
-                projectIconUrls: ['/images/landing/maker.png'],
-                classNames: 'lg-px2 md-px2',
-            },
-            {
-                imageUrl: '/images/landing/loans_icon.png',
-                type: this.props.translate.get(Key.DecentralizedLoans, Deco.Upper),
-                description: this.props.translate.get(Key.DecentralizedLoansDescription, Deco.Cap),
-                projectIconUrls: ['/images/landing/dharma.png', '/images/landing/lendroid.png'],
-                classNames: 'lg-pr2 md-pr2 lg-col-6 md-col-6',
-                style: {
-                    width: 291,
-                    float: 'right',
-                    marginTop: !isSmallScreen ? 38 : 0,
+        const isEnglish = this.props.translate.getLanguage() === Language.English;
+        if (isEnglish) {
+            return [
+                {
+                    imageUrl: '/images/landing/governance_icon.png',
+                    type: this.props.translate.get(Key.GamingAndCollectables, Deco.Upper),
+                    description: this.props.translate.get(Key.GamingAndCollectablesDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
                 },
-            },
-            {
-                imageUrl: '/images/landing/fund_management_icon.png',
-                type: this.props.translate.get(Key.FundManagement, Deco.Upper),
-                description: this.props.translate.get(Key.FundManagementDescription, Deco.Cap),
-                projectIconUrls: ['/images/landing/melonport.png'],
-                classNames: 'lg-pl2 md-pl2 lg-col-6 md-col-6',
-                style: { width: 291, marginTop: !isSmallScreen ? 38 : 0 },
-            },
-        ];
-
+                {
+                    imageUrl: '/images/landing/prediction_market_icon.png',
+                    type: this.props.translate.get(Key.PredictionMarkets, Deco.Upper),
+                    description: this.props.translate.get(Key.PredictionMarketsDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
+                },
+                {
+                    imageUrl: '/images/landing/fund_management_icon.png',
+                    type: this.props.translate.get(Key.OrderBooks, Deco.Upper),
+                    description: this.props.translate.get(Key.OrderBooksDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
+                },
+                {
+                    imageUrl: '/images/landing/loans_icon.png',
+                    type: this.props.translate.get(Key.DecentralizedLoans, Deco.Upper),
+                    description: this.props.translate.get(Key.DecentralizedLoansDescription, Deco.Cap),
+                    classNames: 'lg-pr2 md-pr2 lg-col-6 md-col-6',
+                    style: {
+                        width: 291,
+                        float: 'right',
+                        marginTop: !isSmallScreen ? 38 : 0,
+                    },
+                },
+                {
+                    imageUrl: '/images/landing/stable_tokens_icon.png',
+                    type: this.props.translate.get(Key.StableTokens, Deco.Upper),
+                    description: this.props.translate.get(Key.StableTokensDescription, Deco.Cap),
+                    classNames: 'lg-pl2 md-pl2 lg-col-6 md-col-6',
+                    style: { width: 291, marginTop: !isSmallScreen ? 38 : 0 },
+                },
+            ];
+        } else {
+            return [
+                {
+                    imageUrl: '/images/landing/governance_icon.png',
+                    type: this.props.translate.get(Key.DecentralizedGovernance, Deco.Upper),
+                    description: this.props.translate.get(Key.DecentralizedGovernanceDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
+                },
+                {
+                    imageUrl: '/images/landing/prediction_market_icon.png',
+                    type: this.props.translate.get(Key.PredictionMarkets, Deco.Upper),
+                    description: this.props.translate.get(Key.PredictionMarketsDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
+                },
+                {
+                    imageUrl: '/images/landing/stable_tokens_icon.png',
+                    type: this.props.translate.get(Key.StableTokens, Deco.Upper),
+                    description: this.props.translate.get(Key.StableTokensDescription, Deco.Cap),
+                    classNames: 'lg-px2 md-px2',
+                },
+                {
+                    imageUrl: '/images/landing/loans_icon.png',
+                    type: this.props.translate.get(Key.DecentralizedLoans, Deco.Upper),
+                    description: this.props.translate.get(Key.DecentralizedLoansDescription, Deco.Cap),
+                    classNames: 'lg-pr2 md-pr2 lg-col-6 md-col-6',
+                    style: {
+                        width: 291,
+                        float: 'right',
+                        marginTop: !isSmallScreen ? 38 : 0,
+                    },
+                },
+                {
+                    imageUrl: '/images/landing/fund_management_icon.png',
+                    type: this.props.translate.get(Key.FundManagement, Deco.Upper),
+                    description: this.props.translate.get(Key.FundManagementDescription, Deco.Cap),
+                    classNames: 'lg-pl2 md-pl2 lg-col-6 md-col-6',
+                    style: { width: 291, marginTop: !isSmallScreen ? 38 : 0 },
+                },
+            ];
+        }
+    }
+    private _renderUseCases(): React.ReactNode {
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
+        const useCases = this._getUseCases();
         const cases = _.map(useCases, (useCase: UseCase) => {
             const style = _.isUndefined(useCase.style) || isSmallScreen ? {} : useCase.style;
             const useCaseBoxStyle = {
@@ -626,7 +663,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             );
         });
         return (
-            <div className="clearfix pb4 lg-pt2 md-pt2 sm-pt4" style={{ backgroundColor: colors.heroGrey }}>
+            <div className="clearfix py4" style={{ backgroundColor: colors.heroGrey }}>
                 <div className="mx-auto pb4 pt3 mt1 sm-mt2 clearfix" style={{ maxWidth: '67em' }}>
                     {cases}
                 </div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 398a8da11..c8789c274 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -436,6 +436,10 @@ export enum Key {
     DecentralizedLoansDescription = 'DECENTRALIZED_LOANS_DESCRIPTION',
     FundManagement = 'FUND_MANAGEMENT',
     FundManagementDescription = 'FUND_MANAGEMENT_DESCRIPTION',
+    GamingAndCollectables = 'GAMING_AND_COLLECTABLES',
+    GamingAndCollectablesDescription = 'GAMING_AND_COLLECTABLES_DESCRIPTION',
+    OrderBooks = 'ORDER_BOOKS',
+    OrderBooksDescription = 'ORDER_BOOKS_DESCRIPTION',
     FinalCallToAction = 'FINAL_CALL_TO_ACTION',
     Documentation = 'DOCUMENTATION',
     Community = 'COMMUNITY',
-- 
cgit v1.2.3


From 5d008ee83ead8207c7aa80b249703660be8f7fad Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 11:19:58 -0700
Subject: Update what's new styling

---
 packages/website/ts/pages/landing/landing.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 68984896e..3d0e6eb62 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -215,19 +215,19 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 <a href={WHATS_NEW_URL} target="_blank" className="inline-block text-decoration-none">
                     <div className="flex items-center sm-pl0 md-pl2 lg-pl0">
                         <Container
-                            paddingTop="5px"
+                            paddingTop="3px"
                             paddingLeft="8px"
-                            paddingBottom="5px"
+                            paddingBottom="3px"
                             paddingRight="8px"
                             backgroundColor={colors.white}
                             borderRadius={6}
                         >
-                            <Text fontSize="16px" fontWeight={500} fontColor={colors.heroGrey}>
+                            <Text fontSize="14px" fontWeight={500} fontColor={colors.heroGrey}>
                                 New
                             </Text>
                         </Container>
                         <Container marginLeft="12px">
-                            <Text fontSize="18px" fontWeight={500} fontColor={colors.white}>
+                            <Text fontSize="16px" fontWeight={500} fontColor={colors.grey300}>
                                 {WHATS_NEW_TITLE}
                             </Text>
                         </Container>
-- 
cgit v1.2.3


From 038c21324e2ae37f2cd6f1199ee176707cd1fed4 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 11:27:00 -0700
Subject: Make hero image responsive

---
 packages/website/ts/pages/landing/landing.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 3d0e6eb62..bd861670a 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -8,6 +8,7 @@ import { SubscribeForm } from 'ts/components/forms/subscribe_form';
 import { TopBar } from 'ts/components/top_bar/top_bar';
 import { CallToAction } from 'ts/components/ui/button';
 import { Container } from 'ts/components/ui/container';
+import { Image } from 'ts/components/ui/image';
 import { Text } from 'ts/components/ui/text';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { Deco, Key, Language, ScreenWidths, WebsitePaths } from 'ts/types';
@@ -154,8 +155,8 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 <div className="mx-auto max-width-4 clearfix">
                     {this._renderWhatsNew()}
                     <div className={`${flexClassName} lg-pt4 md-pt4 sm-pt2 lg-pb4 md-pb4 lg-mt4 md-mt4 sm-mt2 sm-mb4`}>
-                        <Container marginTop="30px" marginBottom="30px">
-                            <img src="/images/landing/0x_homepage.svg" height="250px" />
+                        <Container marginTop="30px" marginBottom="30px" marginLeft="15px" marginRight="15px">
+                            <Image src="/images/landing/0x_homepage.svg" maxWidth="100%" height="auto" />
                         </Container>
                         <div className={left} style={{ color: colors.white, height: 390, lineHeight: '390px' }}>
                             <div
-- 
cgit v1.2.3


From f5e7b7e7e0b1a2121a331c511431360647669a78 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 11:37:33 -0700
Subject: Add title header to use cases section

---
 packages/website/ts/pages/landing/landing.tsx | 25 +++++++++++--------------
 packages/website/ts/types.ts                  |  1 +
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index bd861670a..b32526bba 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -42,6 +42,12 @@ interface Project {
 const THROTTLE_TIMEOUT = 100;
 const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
+const TITLE_STYLE: React.CSSProperties = {
+    fontFamily: 'Roboto Mono',
+    color: colors.grey,
+    fontWeight: 300,
+    letterSpacing: 3,
+};
 
 const relayerProjects: Project[] = [
     {
@@ -276,16 +282,10 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 </div>
             );
         });
-        const titleStyle: React.CSSProperties = {
-            fontFamily: 'Roboto Mono',
-            color: colors.grey,
-            fontWeight: 300,
-            letterSpacing: 3,
-        };
         return (
             <div className={`clearfix py4 ${isTitleCenter && 'center'}`} style={{ backgroundColor }}>
                 <div className="mx-auto max-width-4 clearfix sm-px3">
-                    <div className="h4 pb3 lg-pl0 md-pl3 sm-pl2" style={titleStyle}>
+                    <div className="h4 pb3 lg-pl0 md-pl3 sm-pl2" style={TITLE_STYLE}>
                         {title}
                     </div>
                     <div className="clearfix">{projectList}</div>
@@ -517,15 +517,9 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 </div>
             );
         });
-        const titleStyle: React.CSSProperties = {
-            fontFamily: 'Roboto Mono',
-            color: colors.grey,
-            fontWeight: 300,
-            letterSpacing: 3,
-        };
         return (
             <div className="clearfix" style={{ backgroundColor: colors.heroGrey }}>
-                <div className="center pb3 pt4" style={titleStyle}>
+                <div className="center pb3 pt4" style={TITLE_STYLE}>
                     {this.props.translate.get(Key.BenefitsHeader, Deco.Upper)}
                 </div>
                 <div className="mx-auto pb4 sm-mt2 clearfix" style={{ maxWidth: '60em' }}>
@@ -665,6 +659,9 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         });
         return (
             <div className="clearfix py4" style={{ backgroundColor: colors.heroGrey }}>
+                <div className="center h4 pb3 lg-pl0 md-pl3 sm-pl2" style={TITLE_STYLE}>
+                    {this.props.translate.get(Key.UseCasesHeader, Deco.Upper)}
+                </div>
                 <div className="mx-auto pb4 pt3 mt1 sm-mt2 clearfix" style={{ maxWidth: '67em' }}>
                     {cases}
                 </div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index c8789c274..6ab17e261 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -415,6 +415,7 @@ export enum Key {
     OffChainOnChainDescription = 'OFFCHAIN_ONCHAIN_DESCRIPTION',
     RelayersHeader = 'RELAYERS_HEADER',
     BenefitsHeader = 'BENEFITS_HEADER',
+    UseCasesHeader = 'USE_CASES_HEADER',
     BenefitOneTitle = 'BENEFIT_ONE_TITLE',
     BenefitOneDescription = 'BENEFIT_ONE_DESCRIPTION',
     BenefitTwoTitle = 'BENEFIT_TWO_TITLE',
-- 
cgit v1.2.3


From 0368de701fa2443a2537d5ea6cb35bdce1ade638 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 11:44:09 -0700
Subject: Added todo comments for missing items

---
 packages/website/ts/pages/landing/landing.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index b32526bba..0aa9693a4 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -41,6 +41,7 @@ interface Project {
 
 const THROTTLE_TIMEOUT = 100;
 const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
+// TODO: Update this url
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
 const TITLE_STYLE: React.CSSProperties = {
     fontFamily: 'Roboto Mono',
@@ -496,7 +497,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             {
                 title: this.props.translate.get(Key.BenefitThreeTitle, Deco.Cap),
                 description: this.props.translate.get(Key.BenefitThreeDescription, Deco.Cap),
-                imageUrl: '/images/landing/open_source.png',
+                imageUrl: '/images/landing/open_source.png', // TODO: Update this url
                 classNames: 'right',
             },
         ];
-- 
cgit v1.2.3


From 365890291f80a0580c8306c8aa498e64da7f86be Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 29 Aug 2018 15:02:58 -0700
Subject: Add generic title changes

---
 packages/website/ts/pages/landing/landing.tsx | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 0aa9693a4..72f6bdc9c 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -173,26 +173,16 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                     lineHeight: '36px',
                                 }}
                             >
-                                <div
+                                <Text
                                     className="sm-pb2"
-                                    style={{
-                                        fontFamily: 'Roboto Mono',
-                                        fontSize: isSmallScreen ? 26 : 34,
-                                    }}
+                                    fontFamily="Roboto"
+                                    fontColor={colors.grey300}
+                                    fontWeight={500}
+                                    lineHeight="1.2em"
+                                    fontSize={isSmallScreen ? '28px' : '36px'}
                                 >
                                     {this.props.translate.get(Key.TopHeader, Deco.Cap)}
-                                </div>
-                                <div
-                                    className="pt2 h5 sm-mx-auto"
-                                    style={{
-                                        maxWidth: 446,
-                                        fontFamily: 'Roboto Mono',
-                                        lineHeight: 1.7,
-                                        fontWeight: 300,
-                                    }}
-                                >
-                                    {this.props.translate.get(Key.TopTagline)}
-                                </div>
+                                </Text>
                                 <Container className="pt3 clearfix sm-mx-auto" maxWidth="390px">
                                     <div className="lg-pr2 md-pr2 lg-col lg-col-6 sm-center sm-col sm-col-12 mb2">
                                         <Link to={WebsitePaths.ZeroExJs} className="text-decoration-none">
-- 
cgit v1.2.3


From 74d5af34ebf1e4d46a3cb13573d0793579454933 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 29 Aug 2018 16:33:08 -0700
Subject: Add TypedText component and use it on landing page

---
 packages/website/ts/components/ui/text.tsx       |  2 +
 packages/website/ts/components/ui/typed_text.tsx | 75 ++++++++++++++++++++++++
 packages/website/ts/index.tsx                    |  1 +
 packages/website/ts/pages/landing/landing.tsx    | 32 ++++++++++
 4 files changed, 110 insertions(+)
 create mode 100644 packages/website/ts/components/ui/typed_text.tsx

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 734483564..cd8f290e3 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -20,6 +20,7 @@ export interface TextProps {
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     hoverColor?: string;
     noWrap?: boolean;
+    display?: string;
 }
 
 const PlainText: React.StatelessComponent<TextProps> = ({ children, className, onClick, Tag }) => (
@@ -41,6 +42,7 @@ export const Text = styled(PlainText)`
     ${props => (props.onClick ? 'cursor: pointer' : '')};
     transition: color 0.5s ease;
     ${props => (props.noWrap ? 'white-space: nowrap' : '')};
+    ${props => (props.display ? `display: ${props.display}` : '')};
     &:hover {
         ${props => (props.onClick ? `color: ${props.hoverColor || darken(0.3, props.fontColor)}` : '')};
     }
diff --git a/packages/website/ts/components/ui/typed_text.tsx b/packages/website/ts/components/ui/typed_text.tsx
new file mode 100644
index 000000000..a59309139
--- /dev/null
+++ b/packages/website/ts/components/ui/typed_text.tsx
@@ -0,0 +1,75 @@
+import * as _ from 'lodash';
+import { darken } from 'polished';
+import * as React from 'react';
+import Typist from 'react-typist';
+
+import { Text, TextProps } from 'ts/components/ui/text';
+
+import 'react-typist/dist/Typist.css';
+
+export interface TypedTextProps extends TextProps {
+    textList: string[];
+    shouldRepeat?: boolean;
+    wordDelayMs?: number;
+    avgKeystrokeDelayMs?: number;
+    stdKeystrokeDelay?: number;
+}
+
+export interface TypedTextState {
+    cycleCount: number;
+}
+
+export class TypedText extends React.Component<TypedTextProps, TypedTextState> {
+    public static defaultProps = {
+        shouldRepeat: false,
+        avgKeystrokeDelayMs: 90,
+        wordDelayMs: 1000,
+    };
+    public state = {
+        cycleCount: 0,
+    };
+    public render(): React.ReactNode {
+        const {
+            textList,
+            shouldRepeat,
+            wordDelayMs,
+            avgKeystrokeDelayMs,
+            stdKeystrokeDelay,
+            ...textProps
+        } = this.props;
+        const { cycleCount } = this.state;
+        if (_.isEmpty(textList)) {
+            return null;
+        }
+        const typistChildren: React.ReactNode[] = [];
+        _.forEach(textList, text => {
+            typistChildren.push(
+                <Text key={`text-${text}-${cycleCount}`} {...textProps}>
+                    {text}
+                </Text>,
+            );
+            if (wordDelayMs) {
+                typistChildren.push(<Typist.Delay key={`delay-${text}-${cycleCount}`} ms={wordDelayMs} />);
+            }
+            typistChildren.push(<Typist.Backspace key={`backspace-${text}-${cycleCount}`} count={text.length} />);
+        });
+        return (
+            <Typist
+                avgTypingDelay={avgKeystrokeDelayMs}
+                stdTypingDelay={stdKeystrokeDelay}
+                className="inline"
+                key={`typist-key-${cycleCount}`}
+                onTypingDone={this._onTypingDone.bind(this)}
+            >
+                {typistChildren}
+            </Typist>
+        );
+    }
+    private _onTypingDone(): void {
+        if (this.props.shouldRepeat) {
+            this.setState({
+                cycleCount: this.state.cycleCount + 1,
+            });
+        }
+    }
+}
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 9e59b00ac..6b709df6a 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -23,6 +23,7 @@ trackedTokenStorage.clearIfRequired();
 
 import 'basscss/css/basscss.css';
 import 'less/all.less';
+import 'react-typist/dist/Typist.css';
 
 // We pass modulePromise returning lambda instead of module promise,
 // cause we only want to import the module when the user navigates to the page.
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 72f6bdc9c..fc4194849 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -10,6 +10,7 @@ import { CallToAction } from 'ts/components/ui/button';
 import { Container } from 'ts/components/ui/container';
 import { Image } from 'ts/components/ui/image';
 import { Text } from 'ts/components/ui/text';
+import { TypedText } from 'ts/components/ui/typed_text';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { Deco, Key, Language, ScreenWidths, WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
@@ -43,12 +44,26 @@ const THROTTLE_TIMEOUT = 100;
 const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
 // TODO: Update this url
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
+<<<<<<< HEAD
 const TITLE_STYLE: React.CSSProperties = {
     fontFamily: 'Roboto Mono',
     color: colors.grey,
     fontWeight: 300,
     letterSpacing: 3,
 };
+=======
+const ROTATING_LIST = [
+    'tokens',
+    'game items',
+    'digital art',
+    'outcomes',
+    'stocks',
+    'derivatives',
+    'loans',
+    'cats',
+    'Everything.',
+];
+>>>>>>> Add TypedText component and use it on landing page
 
 const relayerProjects: Project[] = [
     {
@@ -176,12 +191,29 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                 <Text
                                     className="sm-pb2"
                                     fontFamily="Roboto"
+                                    display="inline-block"
                                     fontColor={colors.grey300}
                                     fontWeight={500}
                                     lineHeight="1.2em"
                                     fontSize={isSmallScreen ? '28px' : '36px'}
                                 >
                                     {this.props.translate.get(Key.TopHeader, Deco.Cap)}
+                                    {this.props.translate.getLanguage() === Language.English && (
+                                        <React.Fragment>
+                                            {' '}
+                                            for{' '}
+                                            <TypedText
+                                                fontFamily="Roboto"
+                                                display="inline-block"
+                                                fontColor={colors.white}
+                                                fontWeight={700}
+                                                lineHeight="1.2em"
+                                                fontSize={isSmallScreen ? '28px' : '36px'}
+                                                textList={ROTATING_LIST}
+                                                shouldRepeat={true}
+                                            />
+                                        </React.Fragment>
+                                    )}
                                 </Text>
                                 <Container className="pt3 clearfix sm-mx-auto" maxWidth="390px">
                                     <div className="lg-pr2 md-pr2 lg-col lg-col-6 sm-center sm-col sm-col-12 mb2">
-- 
cgit v1.2.3


From febddcb356de32c29ff45e885a0c202a03e064cf Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 29 Aug 2018 16:39:03 -0700
Subject: Remove redundant import

---
 packages/website/ts/index.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 6b709df6a..9e59b00ac 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -23,7 +23,6 @@ trackedTokenStorage.clearIfRequired();
 
 import 'basscss/css/basscss.css';
 import 'less/all.less';
-import 'react-typist/dist/Typist.css';
 
 // We pass modulePromise returning lambda instead of module promise,
 // cause we only want to import the module when the user navigates to the page.
-- 
cgit v1.2.3


From b1f97a27f3b0114ee1d9e648e0365932217c8dc8 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 11:37:58 -0700
Subject: Final tweaks

---
 packages/website/ts/components/ui/button.tsx     |  1 +
 packages/website/ts/components/ui/typed_text.tsx |  1 +
 packages/website/ts/pages/landing/landing.tsx    | 26 ++++++++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 2952c8859..75ba7bcff 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -96,4 +96,5 @@ export const CallToAction: React.StatelessComponent<CallToActionProps> = ({
 CallToAction.defaultProps = {
     type: 'dark',
     fontSize: '14px',
+    padding: '0.9em 1.6em',
 };
diff --git a/packages/website/ts/components/ui/typed_text.tsx b/packages/website/ts/components/ui/typed_text.tsx
index a59309139..2bb2d40b0 100644
--- a/packages/website/ts/components/ui/typed_text.tsx
+++ b/packages/website/ts/components/ui/typed_text.tsx
@@ -35,6 +35,7 @@ export class TypedText extends React.Component<TypedTextProps, TypedTextState> {
             wordDelayMs,
             avgKeystrokeDelayMs,
             stdKeystrokeDelay,
+            // tslint:disable-next-line
             ...textProps
         } = this.props;
         const { cycleCount } = this.state;
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index fc4194849..5a82576a1 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -61,7 +61,7 @@ const ROTATING_LIST = [
     'derivatives',
     'loans',
     'cats',
-    'Everything.',
+    'everything',
 ];
 >>>>>>> Add TypedText component and use it on landing page
 
@@ -170,8 +170,10 @@ export class Landing extends React.Component<LandingProps, LandingState> {
     }
     private _renderHero(): React.ReactNode {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-        const left = 'col lg-col-7 md-col-7 col-12 lg-pl4 md-pl4 sm-pl0 sm-px3 sm-center';
-        const flexClassName = isSmallScreen ? 'flex items-center flex-column' : 'flex items-center';
+        const left = 'col lg-col-6 md-col-6 col-12 lg-pl4 md-pl4 sm-pl0 sm-px3 sm-center';
+        const flexClassName = isSmallScreen
+            ? 'flex items-center flex-column justify-center'
+            : 'flex items-center justify-center';
         return (
             <div className="clearfix py4" style={{ backgroundColor: colors.heroGrey }}>
                 <div className="mx-auto max-width-4 clearfix">
@@ -194,7 +196,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                     display="inline-block"
                                     fontColor={colors.grey300}
                                     fontWeight={500}
-                                    lineHeight="1.2em"
+                                    lineHeight="1.3em"
                                     fontSize={isSmallScreen ? '28px' : '36px'}
                                 >
                                     {this.props.translate.get(Key.TopHeader, Deco.Cap)}
@@ -207,7 +209,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                                 display="inline-block"
                                                 fontColor={colors.white}
                                                 fontWeight={700}
-                                                lineHeight="1.2em"
+                                                lineHeight="1.3em"
                                                 fontSize={isSmallScreen ? '28px' : '36px'}
                                                 textList={ROTATING_LIST}
                                                 shouldRepeat={true}
@@ -215,17 +217,19 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                         </React.Fragment>
                                     )}
                                 </Text>
-                                <Container className="pt3 clearfix sm-mx-auto" maxWidth="390px">
-                                    <div className="lg-pr2 md-pr2 lg-col lg-col-6 sm-center sm-col sm-col-12 mb2">
+                                <Container
+                                    className={`pt3 flex clearfix sm-mx-auto ${isSmallScreen ? 'justify-center' : ''}`}
+                                >
+                                    <Container paddingRight="20px">
                                         <Link to={WebsitePaths.ZeroExJs} className="text-decoration-none">
-                                            <CallToAction width="175px" type="light">
+                                            <CallToAction type="light">
                                                 {this.props.translate.get(Key.BuildCallToAction, Deco.Cap)}
                                             </CallToAction>
                                         </Link>
-                                    </div>
-                                    <div className="lg-col lg-col-6 sm-center sm-col sm-col-12">
+                                    </Container>
+                                    <div>
                                         <Link to={WebsitePaths.Portal} className="text-decoration-none">
-                                            <CallToAction width="175px">
+                                            <CallToAction>
                                                 {this.props.translate.get(Key.TradeCallToAction, Deco.Cap)}
                                             </CallToAction>
                                         </Link>
-- 
cgit v1.2.3


From fd5ad69c268ef5411901d8ff24e429a7e0b4f888 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 11:47:55 -0700
Subject: Add careers page to top bar

---
 packages/website/ts/components/top_bar/top_bar.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 8580c3a6e..1841d890b 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -238,7 +238,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
         const fullWidthClasses = isExpandedDisplayType ? 'pr4' : '';
         const logoUrl = isNightVersion ? '/images/protocol_logo_white.png' : '/images/protocol_logo_black.png';
         const menuClasses = `col col-${
-            isExpandedDisplayType ? '4' : '5'
+            isExpandedDisplayType ? '4' : '6'
         } ${fullWidthClasses} lg-pr0 md-pr2 sm-hide xs-hide`;
         const menuIconStyle = {
             fontSize: 25,
@@ -301,6 +301,13 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                                     isNightVersion={isNightVersion}
                                     isExternal={false}
                                 />
+                                <TopBarMenuItem
+                                    title={this.props.translate.get(Key.Careers, Deco.Cap)}
+                                    path={`${WebsitePaths.Careers}`}
+                                    style={styles.menuItem}
+                                    isNightVersion={isNightVersion}
+                                    isExternal={false}
+                                />
                                 <TopBarMenuItem
                                     title={this.props.translate.get(Key.TradeCallToAction, Deco.Cap)}
                                     path={`${WebsitePaths.Portal}`}
@@ -406,6 +413,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                     <Link to={`${WebsitePaths.About}`} className="text-decoration-none">
                         <MenuItem className="py2">{this.props.translate.get(Key.About, Deco.Cap)}</MenuItem>
                     </Link>
+                    <Link to={`${WebsitePaths.Careers}`} className="text-decoration-none">
+                        <MenuItem className="py2">{this.props.translate.get(Key.Careers, Deco.Cap)}</MenuItem>
+                    </Link>
                     <a className="text-decoration-none" target="_blank" href={constants.URL_BLOG}>
                         <MenuItem className="py2">{this.props.translate.get(Key.Blog, Deco.Cap)}</MenuItem>
                     </a>
-- 
cgit v1.2.3


From c3361bb86e4b022c65b7dc657827b78efca9be41 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 11:52:08 -0700
Subject: Remove conflict strings

---
 packages/website/ts/pages/landing/landing.tsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 5a82576a1..c8dc2fc74 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -44,14 +44,12 @@ const THROTTLE_TIMEOUT = 100;
 const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
 // TODO: Update this url
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
-<<<<<<< HEAD
 const TITLE_STYLE: React.CSSProperties = {
     fontFamily: 'Roboto Mono',
     color: colors.grey,
     fontWeight: 300,
     letterSpacing: 3,
 };
-=======
 const ROTATING_LIST = [
     'tokens',
     'game items',
@@ -63,7 +61,6 @@ const ROTATING_LIST = [
     'cats',
     'everything',
 ];
->>>>>>> Add TypedText component and use it on landing page
 
 const relayerProjects: Project[] = [
     {
-- 
cgit v1.2.3


From 60f1bcf51f0917607582d6027329fd292c7fc251 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 12:09:54 -0700
Subject: Remove unused render methods in landing page

---
 packages/website/ts/pages/landing/landing.tsx | 110 --------------------------
 1 file changed, 110 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index c8dc2fc74..d29abf835 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -366,116 +366,6 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             </div>
         );
     }
-    private _renderProtocolSection(): React.ReactNode {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-        return (
-            <div className="clearfix pt4" style={{ backgroundColor: colors.heroGrey }}>
-                <div className="mx-auto max-width-4 pt4 clearfix">
-                    <div className="col lg-col-6 md-col-6 col-12 sm-center">
-                        <img src="/images/landing/relayer_diagram.png" height={isSmallScreen ? 326 : 426} />
-                    </div>
-                    <div
-                        className="col lg-col-6 md-col-6 col-12 lg-pr3 md-pr3 sm-mx-auto"
-                        style={{
-                            color: colors.beigeWhite,
-                            maxWidth: isSmallScreen ? 'none' : 445,
-                            height: 430,
-                            lineHeight: '430px',
-                        }}
-                    >
-                        <div
-                            className="inline-block lg-align-middle md-align-middle sm-align-top"
-                            style={{ lineHeight: '43px' }}
-                        >
-                            <div
-                                className="lg-h1 md-h1 sm-h2 pb1 sm-pt3 sm-center"
-                                style={{ fontFamily: 'Roboto Mono' }}
-                            >
-                                <div>{this.props.translate.get(Key.OffChainOrderRelay, Deco.Cap)}</div>
-                                <div> {this.props.translate.get(Key.OnChainSettlement, Deco.Cap)}</div>
-                            </div>
-                            <div
-                                className="pb2 pt2 h5 sm-center sm-px3 sm-mx-auto"
-                                style={{
-                                    fontFamily: 'Roboto Mono',
-                                    lineHeight: 1.7,
-                                    fontWeight: 300,
-                                    maxWidth: 445,
-                                }}
-                            >
-                                {this.props.translate.get(Key.OffChainOnChainDescription, Deco.Cap)}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        );
-    }
-    private _renderBuildingBlocksSection(): React.ReactNode {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-        const descriptionStyle: React.CSSProperties = {
-            fontFamily: 'Roboto Mono',
-            lineHeight: isSmallScreen ? 1.5 : 2,
-            fontWeight: 300,
-            fontSize: 15,
-            maxWidth: isSmallScreen ? 375 : 'none',
-        };
-        const callToActionStyle: React.CSSProperties = {
-            fontFamily: 'Roboto Mono',
-            fontSize: 15,
-            fontWeight: 300,
-            maxWidth: isSmallScreen ? 375 : 441,
-        };
-        return (
-            <div className="clearfix lg-pt4 md-pt4" style={{ backgroundColor: colors.heroGrey }}>
-                <div className="mx-auto max-width-4 lg-pt4 md-pt4 lg-mb4 md-mb4 sm-mb2 clearfix">
-                    {isSmallScreen && this._renderBlockChipImage()}
-                    <div
-                        className="col lg-col-6 md-col-6 col-12 lg-pr3 md-pr3 sm-px3"
-                        style={{ color: colors.beigeWhite }}
-                    >
-                        <div
-                            className="pb1 lg-pt4 md-pt4 sm-pt3 lg-h1 md-h1 sm-h2 sm-px3 sm-center"
-                            style={{ fontFamily: 'Roboto Mono' }}
-                        >
-                            {this.props.translate.get(Key.BuildingBlockSectionHeader, Deco.Cap)}
-                        </div>
-                        <div className="pb3 pt2 sm-mx-auto sm-center" style={descriptionStyle}>
-                            {this.props.translate.get(Key.BuildingBlockSectionDescription, Deco.Cap)}
-                        </div>
-                        <div className="sm-mx-auto sm-center" style={callToActionStyle}>
-                            {this.props.translate.get(Key.DevToolsPrompt, Deco.Cap)}{' '}
-                            <Link
-                                to={WebsitePaths.ZeroExJs}
-                                className="text-decoration-none underline"
-                                style={{ color: colors.beigeWhite, fontFamily: 'Roboto Mono' }}
-                            >
-                                0x.js
-                            </Link>{' '}
-                            {this.props.translate.get(Key.And)}{' '}
-                            <Link
-                                to={WebsitePaths.SmartContracts}
-                                className="text-decoration-none underline"
-                                style={{ color: colors.beigeWhite, fontFamily: 'Roboto Mono' }}
-                            >
-                                {this.props.translate.get(Key.SmartContract)}
-                            </Link>{' '}
-                            {this.props.translate.get(Key.Docs)}
-                        </div>
-                    </div>
-                    {!isSmallScreen && this._renderBlockChipImage()}
-                </div>
-            </div>
-        );
-    }
-    private _renderBlockChipImage(): React.ReactNode {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
-        return (
-            <div className="col lg-col-6 md-col-6 col-12 sm-center">
-                <img src="/images/landing/0x_chips.png" height={isSmallScreen ? 240 : 368} />
-            </div>
-        );
-    }
     private _renderTokenCloud(): React.ReactNode {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         return (
-- 
cgit v1.2.3


From e90dbf66f33d7d37ec07803df930a3c955eb4e73 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 12:29:47 -0700
Subject: Add new exchange everywhere graphic

---
 packages/website/ts/pages/landing/landing.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index d29abf835..e2b4d8f80 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -410,7 +410,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             {
                 title: this.props.translate.get(Key.BenefitThreeTitle, Deco.Cap),
                 description: this.props.translate.get(Key.BenefitThreeDescription, Deco.Cap),
-                imageUrl: '/images/landing/open_source.png', // TODO: Update this url
+                imageUrl: '/images/landing/exchange_everywhere.png',
                 classNames: 'right',
             },
         ];
@@ -418,9 +418,13 @@ export class Landing extends React.Component<LandingProps, LandingState> {
             return (
                 <div key={`box-${boxContent.title}`} className="col lg-col-4 md-col-4 col-12 sm-pb4">
                     <div className={`center sm-mx-auto ${!isSmallScreen && boxContent.classNames}`} style={boxStyle}>
-                        <div>
-                            <img src={boxContent.imageUrl} style={{ height: 210 }} />
-                        </div>
+                        <Container className="flex items-center" height="210px">
+                            <img
+                                className="mx-auto"
+                                src={boxContent.imageUrl}
+                                style={{ height: 'auto', maxWidth: 160 }}
+                            />
+                        </Container>
                         <div className="h3" style={{ color: 'black', fontFamily: 'Roboto Mono' }}>
                             {boxContent.title}
                         </div>
-- 
cgit v1.2.3


From a224ce347e3ee15b7bb3992a3f59d1576b07b46a Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 13:21:07 -0700
Subject: Revert whats new text

---
 packages/website/ts/pages/landing/landing.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index e2b4d8f80..34f124d8c 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -41,8 +41,7 @@ interface Project {
 }
 
 const THROTTLE_TIMEOUT = 100;
-const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!';
-// TODO: Update this url
+const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018';
 const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
 const TITLE_STYLE: React.CSSProperties = {
     fontFamily: 'Roboto Mono',
-- 
cgit v1.2.3


From 1d5ef4d0ca4d0c65b6b73c56eb18550840bbc936 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 13:24:17 -0700
Subject: Fix unused vars for react-shared and website

---
 packages/website/ts/components/top_bar/top_bar.tsx                | 2 +-
 packages/website/ts/containers/connect_documentation.ts           | 2 +-
 packages/website/ts/containers/contract_wrappers_documentation.ts | 3 +--
 packages/website/ts/containers/ethereum_types_documentation.ts    | 1 -
 packages/website/ts/containers/order_utils_documentation.ts       | 1 -
 packages/website/ts/containers/order_watcher_documentation.ts     | 1 -
 packages/website/ts/containers/sol_compiler_documentation.ts      | 2 +-
 packages/website/ts/containers/sol_cov_documentation.ts           | 2 +-
 packages/website/ts/containers/subproviders_documentation.ts      | 3 +--
 packages/website/ts/containers/web3_wrapper_documentation.ts      | 3 +--
 packages/website/ts/containers/zero_ex_js_documentation.ts        | 3 +--
 11 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 8580c3a6e..fdfed961c 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -19,7 +19,7 @@ import { TopBarMenuItem } from 'ts/components/top_bar/top_bar_menu_item';
 import { Container } from 'ts/components/ui/container';
 import { DropDown } from 'ts/components/ui/drop_down';
 import { Dispatcher } from 'ts/redux/dispatcher';
-import { Deco, Key, ProviderType, WebsiteLegacyPaths, WebsitePaths } from 'ts/types';
+import { Deco, Key, ProviderType, WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts
index 90137243c..a728abe2c 100644
--- a/packages/website/ts/containers/connect_documentation.ts
+++ b/packages/website/ts/containers/connect_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/contract_wrappers_documentation.ts b/packages/website/ts/containers/contract_wrappers_documentation.ts
index fd8599192..1e1735846 100644
--- a/packages/website/ts/containers/contract_wrappers_documentation.ts
+++ b/packages/website/ts/containers/contract_wrappers_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/ethereum_types_documentation.ts b/packages/website/ts/containers/ethereum_types_documentation.ts
index e0bf9a83e..2b6d6e64d 100644
--- a/packages/website/ts/containers/ethereum_types_documentation.ts
+++ b/packages/website/ts/containers/ethereum_types_documentation.ts
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/order_utils_documentation.ts b/packages/website/ts/containers/order_utils_documentation.ts
index 47ac35268..b54c30a1e 100644
--- a/packages/website/ts/containers/order_utils_documentation.ts
+++ b/packages/website/ts/containers/order_utils_documentation.ts
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/order_watcher_documentation.ts b/packages/website/ts/containers/order_watcher_documentation.ts
index 2fa2a9d61..59a018847 100644
--- a/packages/website/ts/containers/order_watcher_documentation.ts
+++ b/packages/website/ts/containers/order_watcher_documentation.ts
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/sol_compiler_documentation.ts b/packages/website/ts/containers/sol_compiler_documentation.ts
index 7cde68e5c..20f26ed1d 100644
--- a/packages/website/ts/containers/sol_compiler_documentation.ts
+++ b/packages/website/ts/containers/sol_compiler_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/sol_cov_documentation.ts b/packages/website/ts/containers/sol_cov_documentation.ts
index a457cbc1e..27efd641e 100644
--- a/packages/website/ts/containers/sol_cov_documentation.ts
+++ b/packages/website/ts/containers/sol_cov_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts
index 43f06b4ed..28b2e9508 100644
--- a/packages/website/ts/containers/subproviders_documentation.ts
+++ b/packages/website/ts/containers/subproviders_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts
index 13924fde8..dc9d23304 100644
--- a/packages/website/ts/containers/web3_wrapper_documentation.ts
+++ b/packages/website/ts/containers/web3_wrapper_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index 367d3e064..922dd3c10 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -6,7 +6,6 @@ import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentatio
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
 import { DocPackages } from 'ts/types';
-import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-- 
cgit v1.2.3


From 2cac431c41fdcd7ee44cd9fb36e24bcac6ced40a Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 13:53:30 -0700
Subject: Final tweaks for landing page

---
 packages/website/ts/pages/landing/landing.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 34f124d8c..85e30a9fa 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -53,7 +53,7 @@ const ROTATING_LIST = [
     'tokens',
     'game items',
     'digital art',
-    'outcomes',
+    'futures',
     'stocks',
     'derivatives',
     'loans',
-- 
cgit v1.2.3


From c64f0ba34bfdaccc23cbddb5f21e20f7d2e25668 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 30 Aug 2018 15:26:03 -0700
Subject: Tweaks to benefits and use cases

---
 packages/website/ts/pages/landing/landing.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 85e30a9fa..7dfd9c9df 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -22,6 +22,7 @@ interface BoxContent {
     description: string;
     imageUrl: string;
     classNames: string;
+    maxWidth: number;
 }
 interface AssetType {
     title: string;
@@ -399,18 +400,21 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 description: this.props.translate.get(Key.BenefitOneDescription, Deco.Cap),
                 imageUrl: '/images/landing/distributed_network.png',
                 classNames: '',
+                maxWidth: 160,
             },
             {
                 title: this.props.translate.get(Key.BenefitTwoTitle, Deco.Cap),
                 description: this.props.translate.get(Key.BenefitTwoDescription, Deco.Cap),
                 imageUrl: '/images/landing/liquidity.png',
                 classNames: 'mx-auto',
+                maxWidth: 160,
             },
             {
                 title: this.props.translate.get(Key.BenefitThreeTitle, Deco.Cap),
                 description: this.props.translate.get(Key.BenefitThreeDescription, Deco.Cap),
                 imageUrl: '/images/landing/exchange_everywhere.png',
                 classNames: 'right',
+                maxWidth: 130,
             },
         ];
         const boxes = _.map(boxContents, (boxContent: BoxContent) => {
@@ -421,7 +425,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                             <img
                                 className="mx-auto"
                                 src={boxContent.imageUrl}
-                                style={{ height: 'auto', maxWidth: 160 }}
+                                style={{ height: 'auto', maxWidth: boxContent.maxWidth }}
                             />
                         </Container>
                         <div className="h3" style={{ color: 'black', fontFamily: 'Roboto Mono' }}>
@@ -565,7 +569,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                 lineHeight: 1.5,
                                 fontSize: 14,
                                 overflow: 'hidden',
-                                height: 104,
+                                height: 124,
                             }}
                         >
                             {useCase.description}
-- 
cgit v1.2.3