From 791eae24c0c38368eecf3be4b9c1f162a29ca065 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 27 Aug 2018 12:16:58 +0100
Subject: Add ability to specify styling to popover container

---
 packages/website/ts/components/ui/drop_down.tsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 4d5caef08..1daaeb1c3 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -21,6 +21,7 @@ export interface DropDownProps {
     zDepth?: number;
     activateEvent?: DropdownMouseEvent;
     closeEvent?: DropdownMouseEvent;
+    popoverStyle?: React.CSSProperties;
 }
 
 interface DropDownState {
@@ -34,6 +35,7 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
         zDepth: 1,
         activateEvent: DropdownMouseEvent.Hover,
         closeEvent: DropdownMouseEvent.Hover,
+        popoverStyle: {},
     };
     private _isHovering: boolean;
     private _popoverCloseCheckIntervalId: number;
@@ -77,6 +79,7 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                     useLayerForClickAway={this.props.closeEvent === DropdownMouseEvent.Click}
                     animated={false}
                     zDepth={this.props.zDepth}
+                    style={this.props.popoverStyle}
                 >
                     <div
                         onMouseEnter={this._onHover.bind(this)}
-- 
cgit v1.2.3


From ce51edcf80cbecab6f04db4704ddcf21c804f3b0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 17 Sep 2018 16:55:22 +0100
Subject: Implement new responsive, dev section header and home scaffolding

---
 packages/website/ts/components/ui/container.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index f2ae68b70..1e0bfd959 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -15,6 +15,7 @@ export interface ContainerProps {
     paddingRight?: StringOrNum;
     paddingLeft?: StringOrNum;
     backgroundColor?: string;
+    background?: string;
     borderRadius?: StringOrNum;
     maxWidth?: StringOrNum;
     maxHeight?: StringOrNum;
-- 
cgit v1.2.3


From a9b4027dc49b601af26f9ab1be2d97b32d46b073 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 26 Sep 2018 13:37:25 +0100
Subject: Create a link ui component that abstracts away interval vs. internal
 links

---
 packages/website/ts/components/ui/link.tsx | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 packages/website/ts/components/ui/link.tsx

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
new file mode 100644
index 000000000..252199457
--- /dev/null
+++ b/packages/website/ts/components/ui/link.tsx
@@ -0,0 +1,42 @@
+import * as React from 'react';
+import { Link as ReactRounterLink } from 'react-router-dom';
+
+export interface LinkProps {
+    to: string;
+    isExternal?: boolean;
+    shouldOpenInNewTab?: boolean;
+    style?: React.CSSProperties;
+    className?: string;
+}
+
+export const Link: React.StatelessComponent<LinkProps> = ({
+    style,
+    className,
+    isExternal,
+    to,
+    shouldOpenInNewTab,
+    children,
+}) => {
+    if (isExternal) {
+        return (
+            <a target={shouldOpenInNewTab && '_blank'} className={className} style={style} href={to}>
+                {children}
+            </a>
+        );
+    } else {
+        return (
+            <ReactRounterLink to={to} className={className} style={style}>
+                {children}
+            </ReactRounterLink>
+        );
+    }
+};
+
+Link.defaultProps = {
+    isExternal: false,
+    shouldOpenInNewTab: false,
+    style: {},
+    className: '',
+};
+
+Link.displayName = 'Link';
-- 
cgit v1.2.3


From 67a2359014d933561425258ae774f7005ef52b15 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 1 Oct 2018 22:07:03 +0100
Subject: Add comment about link component

---
 packages/website/ts/components/ui/link.tsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
index 252199457..f7bca370b 100644
--- a/packages/website/ts/components/ui/link.tsx
+++ b/packages/website/ts/components/ui/link.tsx
@@ -9,6 +9,11 @@ export interface LinkProps {
     className?: string;
 }
 
+/**
+ * A generic link component which let's the developer render internal & external links, and their associated
+ * behaviors with a single link component. Many times we want a menu including both internal & external links
+ * and this abstracts away the differences of rendering both types of links.
+ */
 export const Link: React.StatelessComponent<LinkProps> = ({
     style,
     className,
-- 
cgit v1.2.3


From c07412a992284b2f3045be1c620ea2e0a351139a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 2 Oct 2018 20:10:59 +0100
Subject: Use new Link UI component everywhere, and add complementary ALink
 type

---
 .../website/ts/components/ui/custom_menu_item.tsx  | 51 ++++++++++++++++++++++
 packages/website/ts/components/ui/link.tsx         | 43 +++++++++++-------
 packages/website/ts/components/ui/menu_item.tsx    | 51 ----------------------
 packages/website/ts/components/ui/simple_menu.tsx  |  4 +-
 4 files changed, 80 insertions(+), 69 deletions(-)
 create mode 100644 packages/website/ts/components/ui/custom_menu_item.tsx
 delete mode 100644 packages/website/ts/components/ui/menu_item.tsx

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
new file mode 100644
index 000000000..c51095709
--- /dev/null
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -0,0 +1,51 @@
+import * as _ from 'lodash';
+import * as React from 'react';
+import { Link } from 'ts/components/ui/link';
+
+interface CustomMenuItemProps {
+    to: string;
+    style?: React.CSSProperties;
+    onClick?: () => void;
+    className?: string;
+}
+
+interface CustomMenuItemState {
+    isHovering: boolean;
+}
+
+export class CustomMenuItem extends React.Component<CustomMenuItemProps, CustomMenuItemState> {
+    public static defaultProps: Partial<CustomMenuItemProps> = {
+        onClick: _.noop.bind(_),
+        className: '',
+    };
+    public constructor(props: CustomMenuItemProps) {
+        super(props);
+        this.state = {
+            isHovering: false,
+        };
+    }
+    public render(): React.ReactNode {
+        const menuItemStyles = {
+            cursor: 'pointer',
+            opacity: this.state.isHovering ? 0.5 : 1,
+        };
+        return (
+            <Link to={this.props.to} style={this.props.style}>
+                <div
+                    onClick={this.props.onClick.bind(this)}
+                    className={`mx-auto ${this.props.className}`}
+                    style={menuItemStyles}
+                    onMouseEnter={this._onToggleHover.bind(this, true)}
+                    onMouseLeave={this._onToggleHover.bind(this, false)}
+                >
+                    {this.props.children}
+                </div>
+            </Link>
+        );
+    }
+    private _onToggleHover(isHovering: boolean): void {
+        this.setState({
+            isHovering,
+        });
+    }
+}
diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
index f7bca370b..ae62aad0c 100644
--- a/packages/website/ts/components/ui/link.tsx
+++ b/packages/website/ts/components/ui/link.tsx
@@ -1,9 +1,10 @@
 import * as React from 'react';
 import { Link as ReactRounterLink } from 'react-router-dom';
+import { LinkType } from 'ts/types';
 
 export interface LinkProps {
     to: string;
-    isExternal?: boolean;
+    type?: LinkType;
     shouldOpenInNewTab?: boolean;
     style?: React.CSSProperties;
     className?: string;
@@ -17,29 +18,39 @@ export interface LinkProps {
 export const Link: React.StatelessComponent<LinkProps> = ({
     style,
     className,
-    isExternal,
+    type,
     to,
     shouldOpenInNewTab,
     children,
 }) => {
-    if (isExternal) {
-        return (
-            <a target={shouldOpenInNewTab && '_blank'} className={className} style={style} href={to}>
-                {children}
-            </a>
-        );
-    } else {
-        return (
-            <ReactRounterLink to={to} className={className} style={style}>
-                {children}
-            </ReactRounterLink>
-        );
+    const styleWithDefault = {
+        textDecoration: 'none',
+        ...style,
+    };
+
+    switch (type) {
+        case LinkType.External:
+            return (
+                <a target={shouldOpenInNewTab && '_blank'} className={className} style={styleWithDefault} href={to}>
+                    {children}
+                </a>
+            );
+        case LinkType.ReactRoute:
+            return (
+                <ReactRounterLink to={to} className={className} style={styleWithDefault}>
+                    {children}
+                </ReactRounterLink>
+            );
+        case LinkType.ReactScroll:
+            return <div>TODO</div>;
+        default:
+            throw new Error(`Unrecognized LinkType: ${type}`);
     }
 };
 
 Link.defaultProps = {
-    isExternal: false,
-    shouldOpenInNewTab: false,
+    type: LinkType.ReactRoute,
+    shouldOpenInNewTab: true,
     style: {},
     className: '',
 };
diff --git a/packages/website/ts/components/ui/menu_item.tsx b/packages/website/ts/components/ui/menu_item.tsx
deleted file mode 100644
index 0cb4b387c..000000000
--- a/packages/website/ts/components/ui/menu_item.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import * as _ from 'lodash';
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-
-interface MenuItemProps {
-    to: string;
-    style?: React.CSSProperties;
-    onClick?: () => void;
-    className?: string;
-}
-
-interface MenuItemState {
-    isHovering: boolean;
-}
-
-export class MenuItem extends React.Component<MenuItemProps, MenuItemState> {
-    public static defaultProps: Partial<MenuItemProps> = {
-        onClick: _.noop.bind(_),
-        className: '',
-    };
-    public constructor(props: MenuItemProps) {
-        super(props);
-        this.state = {
-            isHovering: false,
-        };
-    }
-    public render(): React.ReactNode {
-        const menuItemStyles = {
-            cursor: 'pointer',
-            opacity: this.state.isHovering ? 0.5 : 1,
-        };
-        return (
-            <Link to={this.props.to} style={{ textDecoration: 'none', ...this.props.style }}>
-                <div
-                    onClick={this.props.onClick.bind(this)}
-                    className={`mx-auto ${this.props.className}`}
-                    style={menuItemStyles}
-                    onMouseEnter={this._onToggleHover.bind(this, true)}
-                    onMouseLeave={this._onToggleHover.bind(this, false)}
-                >
-                    {this.props.children}
-                </div>
-            </Link>
-        );
-    }
-    private _onToggleHover(isHovering: boolean): void {
-        this.setState({
-            isHovering,
-        });
-    }
-}
diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx
index 8a9349c6d..767da3675 100644
--- a/packages/website/ts/components/ui/simple_menu.tsx
+++ b/packages/website/ts/components/ui/simple_menu.tsx
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
-import { Link } from 'react-router-dom';
+import { Link } from 'ts/components/ui/link';
 
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
@@ -72,7 +72,7 @@ export const GoToAccountManagementSimpleMenuItem: React.StatelessComponent<
     GoToAccountManagementSimpleMenuItemProps
 > = ({ onClick }) => {
     return (
-        <Link to={`${WebsitePaths.Portal}/account`} style={{ textDecoration: 'none' }}>
+        <Link to={`${WebsitePaths.Portal}/account`}>
             <SimpleMenuItem displayText="Manage Account..." onClick={onClick} />
         </Link>
     );
-- 
cgit v1.2.3


From 4fb7b3515389439e1ffafebf520d0cfd84efb5d1 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 10:52:37 +0100
Subject: Convert remaining Links to new UI component

---
 packages/website/ts/components/ui/link.tsx | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
index ae62aad0c..30c76e3c9 100644
--- a/packages/website/ts/components/ui/link.tsx
+++ b/packages/website/ts/components/ui/link.tsx
@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
 import * as React from 'react';
 import { Link as ReactRounterLink } from 'react-router-dom';
 import { LinkType } from 'ts/types';
@@ -8,6 +9,9 @@ export interface LinkProps {
     shouldOpenInNewTab?: boolean;
     style?: React.CSSProperties;
     className?: string;
+    onMouseOver?: (event: React.MouseEvent<HTMLElement>) => void;
+    onMouseLeave?: (event: React.MouseEvent<HTMLElement>) => void;
+    onMouseEnter?: (event: React.MouseEvent<HTMLElement>) => void;
 }
 
 /**
@@ -22,6 +26,9 @@ export const Link: React.StatelessComponent<LinkProps> = ({
     to,
     shouldOpenInNewTab,
     children,
+    onMouseOver,
+    onMouseLeave,
+    onMouseEnter,
 }) => {
     const styleWithDefault = {
         textDecoration: 'none',
@@ -31,13 +38,29 @@ export const Link: React.StatelessComponent<LinkProps> = ({
     switch (type) {
         case LinkType.External:
             return (
-                <a target={shouldOpenInNewTab && '_blank'} className={className} style={styleWithDefault} href={to}>
+                <a
+                    target={shouldOpenInNewTab && '_blank'}
+                    className={className}
+                    style={styleWithDefault}
+                    href={to}
+                    onMouseOver={onMouseOver}
+                    onMouseEnter={onMouseEnter}
+                    onMouseLeave={onMouseLeave}
+                >
                     {children}
                 </a>
             );
         case LinkType.ReactRoute:
             return (
-                <ReactRounterLink to={to} className={className} style={styleWithDefault}>
+                <ReactRounterLink
+                    to={to}
+                    className={className}
+                    style={styleWithDefault}
+                    target={shouldOpenInNewTab && '_blank'}
+                    onMouseOver={onMouseOver}
+                    onMouseEnter={onMouseEnter}
+                    onMouseLeave={onMouseLeave}
+                >
                     {children}
                 </ReactRounterLink>
             );
@@ -53,6 +76,9 @@ Link.defaultProps = {
     shouldOpenInNewTab: true,
     style: {},
     className: '',
+    onMouseOver: _.noop.bind(_),
+    onMouseLeave: _.noop.bind(_),
+    onMouseEnter: _.noop.bind(_),
 };
 
 Link.displayName = 'Link';
-- 
cgit v1.2.3


From 55d61b0dc759255ce15b7c6be1a4dab2d9df792d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 12:14:22 +0100
Subject: Add border underneath logo while user is scrolling

---
 packages/website/ts/components/ui/container.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index 1e0bfd959..782ab3b6f 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -17,6 +17,7 @@ export interface ContainerProps {
     backgroundColor?: string;
     background?: string;
     borderRadius?: StringOrNum;
+    borderBottom?: StringOrNum;
     maxWidth?: StringOrNum;
     maxHeight?: StringOrNum;
     width?: StringOrNum;
-- 
cgit v1.2.3


From 6d8427a024d0175c4e0305503321b4169ff9ce05 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 14:26:30 +0100
Subject: Don't make opening links in new tab a default

---
 packages/website/ts/components/ui/link.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
index 30c76e3c9..f8522ca2b 100644
--- a/packages/website/ts/components/ui/link.tsx
+++ b/packages/website/ts/components/ui/link.tsx
@@ -39,7 +39,7 @@ export const Link: React.StatelessComponent<LinkProps> = ({
         case LinkType.External:
             return (
                 <a
-                    target={shouldOpenInNewTab && '_blank'}
+                    target={shouldOpenInNewTab ? '_blank' : ''}
                     className={className}
                     style={styleWithDefault}
                     href={to}
@@ -51,12 +51,15 @@ export const Link: React.StatelessComponent<LinkProps> = ({
                 </a>
             );
         case LinkType.ReactRoute:
+            if (to === '/') {
+                console.log('got here!');
+            }
             return (
                 <ReactRounterLink
                     to={to}
                     className={className}
                     style={styleWithDefault}
-                    target={shouldOpenInNewTab && '_blank'}
+                    target={shouldOpenInNewTab ? '_blank' : ''}
                     onMouseOver={onMouseOver}
                     onMouseEnter={onMouseEnter}
                     onMouseLeave={onMouseLeave}
@@ -73,7 +76,7 @@ export const Link: React.StatelessComponent<LinkProps> = ({
 
 Link.defaultProps = {
     type: LinkType.ReactRoute,
-    shouldOpenInNewTab: true,
+    shouldOpenInNewTab: false,
     style: {},
     className: '',
     onMouseOver: _.noop.bind(_),
-- 
cgit v1.2.3


From ab855cdd1cfa2e4fcc45499508dca9c9e8733b61 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 14:43:25 +0100
Subject: remove stray console

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

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
index f8522ca2b..ad98efa6c 100644
--- a/packages/website/ts/components/ui/link.tsx
+++ b/packages/website/ts/components/ui/link.tsx
@@ -51,9 +51,6 @@ export const Link: React.StatelessComponent<LinkProps> = ({
                 </a>
             );
         case LinkType.ReactRoute:
-            if (to === '/') {
-                console.log('got here!');
-            }
             return (
                 <ReactRounterLink
                     to={to}
-- 
cgit v1.2.3


From 437612f8b8c28fb384698c5c2b331e173cee8767 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 16:37:59 +0100
Subject: Use same Link UI component for react-scroll links

---
 .../website/ts/components/ui/custom_menu_item.tsx  |  2 +-
 packages/website/ts/components/ui/link.tsx         | 84 ----------------------
 packages/website/ts/components/ui/simple_menu.tsx  |  2 +-
 3 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 packages/website/ts/components/ui/link.tsx

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
index c51095709..11f61b336 100644
--- a/packages/website/ts/components/ui/custom_menu_item.tsx
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -1,6 +1,6 @@
+import { Link } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import { Link } from 'ts/components/ui/link';
 
 interface CustomMenuItemProps {
     to: string;
diff --git a/packages/website/ts/components/ui/link.tsx b/packages/website/ts/components/ui/link.tsx
deleted file mode 100644
index ad98efa6c..000000000
--- a/packages/website/ts/components/ui/link.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as _ from 'lodash';
-import * as React from 'react';
-import { Link as ReactRounterLink } from 'react-router-dom';
-import { LinkType } from 'ts/types';
-
-export interface LinkProps {
-    to: string;
-    type?: LinkType;
-    shouldOpenInNewTab?: boolean;
-    style?: React.CSSProperties;
-    className?: string;
-    onMouseOver?: (event: React.MouseEvent<HTMLElement>) => void;
-    onMouseLeave?: (event: React.MouseEvent<HTMLElement>) => void;
-    onMouseEnter?: (event: React.MouseEvent<HTMLElement>) => void;
-}
-
-/**
- * A generic link component which let's the developer render internal & external links, and their associated
- * behaviors with a single link component. Many times we want a menu including both internal & external links
- * and this abstracts away the differences of rendering both types of links.
- */
-export const Link: React.StatelessComponent<LinkProps> = ({
-    style,
-    className,
-    type,
-    to,
-    shouldOpenInNewTab,
-    children,
-    onMouseOver,
-    onMouseLeave,
-    onMouseEnter,
-}) => {
-    const styleWithDefault = {
-        textDecoration: 'none',
-        ...style,
-    };
-
-    switch (type) {
-        case LinkType.External:
-            return (
-                <a
-                    target={shouldOpenInNewTab ? '_blank' : ''}
-                    className={className}
-                    style={styleWithDefault}
-                    href={to}
-                    onMouseOver={onMouseOver}
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                >
-                    {children}
-                </a>
-            );
-        case LinkType.ReactRoute:
-            return (
-                <ReactRounterLink
-                    to={to}
-                    className={className}
-                    style={styleWithDefault}
-                    target={shouldOpenInNewTab ? '_blank' : ''}
-                    onMouseOver={onMouseOver}
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                >
-                    {children}
-                </ReactRounterLink>
-            );
-        case LinkType.ReactScroll:
-            return <div>TODO</div>;
-        default:
-            throw new Error(`Unrecognized LinkType: ${type}`);
-    }
-};
-
-Link.defaultProps = {
-    type: LinkType.ReactRoute,
-    shouldOpenInNewTab: false,
-    style: {},
-    className: '',
-    onMouseOver: _.noop.bind(_),
-    onMouseLeave: _.noop.bind(_),
-    onMouseEnter: _.noop.bind(_),
-};
-
-Link.displayName = 'Link';
diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx
index 767da3675..bdaf0701e 100644
--- a/packages/website/ts/components/ui/simple_menu.tsx
+++ b/packages/website/ts/components/ui/simple_menu.tsx
@@ -1,7 +1,7 @@
+import { Link } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
-import { Link } from 'ts/components/ui/link';
 
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
-- 
cgit v1.2.3


From 5f2cd33da07a7acc65f2e05acb35755f74af75a4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 5 Oct 2018 13:54:37 +0100
Subject: Remove style prop from Link

---
 packages/website/ts/components/ui/custom_menu_item.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
index 11f61b336..c25da6be6 100644
--- a/packages/website/ts/components/ui/custom_menu_item.tsx
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -4,7 +4,6 @@ import * as React from 'react';
 
 interface CustomMenuItemProps {
     to: string;
-    style?: React.CSSProperties;
     onClick?: () => void;
     className?: string;
 }
@@ -30,7 +29,7 @@ export class CustomMenuItem extends React.Component<CustomMenuItemProps, CustomM
             opacity: this.state.isHovering ? 0.5 : 1,
         };
         return (
-            <Link to={this.props.to} style={this.props.style}>
+            <Link to={this.props.to}>
                 <div
                     onClick={this.props.onClick.bind(this)}
                     className={`mx-auto ${this.props.className}`}
-- 
cgit v1.2.3


From df7210163ad2835dcb6e461da173d1873d3195d4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 5 Oct 2018 15:33:15 +0100
Subject: Convert more divs to containers and text components

---
 packages/website/ts/components/ui/container.tsx | 2 ++
 packages/website/ts/components/ui/text.tsx      | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index 782ab3b6f..ece077563 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -17,6 +17,8 @@ export interface ContainerProps {
     backgroundColor?: string;
     background?: string;
     borderRadius?: StringOrNum;
+    borderBottomLeftRadius?: StringOrNum;
+    borderBottomRightRadius?: StringOrNum;
     borderBottom?: StringOrNum;
     maxWidth?: StringOrNum;
     maxHeight?: StringOrNum;
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index cd8f290e3..4415962b1 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -19,7 +19,9 @@ export interface TextProps {
     textDecorationLine?: string;
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     hoverColor?: string;
+    letterSpacing?: string | number;
     noWrap?: boolean;
+    textAlign?: string;
     display?: string;
 }
 
@@ -34,6 +36,8 @@ export const Text = styled(PlainText)`
     font-style: ${props => props.fontStyle};
     font-weight: ${props => props.fontWeight};
     font-size: ${props => props.fontSize};
+    text-align: ${props => props.textAlign};
+    letter-spacing: ${props => props.letterSpacing};
     text-decoration-line: ${props => props.textDecorationLine};
     ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
     ${props => (props.center ? 'text-align: center' : '')};
-- 
cgit v1.2.3


From 636ce6331bf854d6b7b12a1e87929a5a55184062 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 11 Oct 2018 13:33:49 +0200
Subject: fix(website): Avoid hover activated dropdown from closing when
 activeNode is  clicked

---
 packages/website/ts/components/ui/drop_down.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 1daaeb1c3..9044b218d 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
 import Popover from 'material-ui/Popover';
 import * as React from 'react';
 import { MaterialUIPosition } from 'ts/types';
@@ -75,7 +76,11 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
                     anchorEl={this.state.anchorEl}
                     anchorOrigin={this.props.anchorOrigin}
                     targetOrigin={this.props.targetOrigin}
-                    onRequestClose={this._closePopover.bind(this)}
+                    onRequestClose={
+                        this.props.closeEvent === DropdownMouseEvent.Click
+                            ? this._closePopover.bind(this)
+                            : _.noop.bind(_)
+                    }
                     useLayerForClickAway={this.props.closeEvent === DropdownMouseEvent.Click}
                     animated={false}
                     zDepth={this.props.zDepth}
-- 
cgit v1.2.3


From 6baadc746e35724ec4193e9afa01cd17e836372c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sat, 13 Oct 2018 16:29:14 +0100
Subject: Implement new version dropdown and remove it from nestedTopBar

---
 packages/website/ts/components/ui/button.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 75ba7bcff..ccaadc800 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -10,6 +10,7 @@ export interface ButtonProps {
     fontFamily?: string;
     backgroundColor?: string;
     borderColor?: string;
+    borderRadius?: string;
     width?: string;
     padding?: string;
     type?: string;
@@ -29,7 +30,7 @@ export const Button = styled(PlainButton)`
     color: ${props => props.fontColor};
     transition: background-color, opacity 0.5s ease;
     padding: ${props => props.padding};
-    border-radius: 6px;
+    border-radius: ${props => props.borderRadius};
     font-weight: 500;
     outline: none;
     font-family: ${props => props.fontFamily};
@@ -52,6 +53,7 @@ export const Button = styled(PlainButton)`
 
 Button.defaultProps = {
     fontSize: '12px',
+    borderRadius: '6px',
     backgroundColor: colors.white,
     width: 'auto',
     fontFamily: 'Roboto',
-- 
cgit v1.2.3


From d85daab96700dc77cd55f5b97c1e290a95ef20a4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sat, 13 Oct 2018 17:09:46 +0100
Subject: fix: Dropdown component so that re-clicking the activeNode when
 dropdown is open, closes it

---
 packages/website/ts/components/ui/drop_down.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 9044b218d..4138b3fe5 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -100,7 +100,7 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
     private _onActiveNodeClick(event: React.FormEvent<HTMLInputElement>): void {
         if (this.props.activateEvent === DropdownMouseEvent.Click) {
             this.setState({
-                isDropDownOpen: true,
+                isDropDownOpen: !this.state.isDropDownOpen,
                 anchorEl: event.currentTarget,
             });
         }
-- 
cgit v1.2.3


From 18c31a3bc045d9e3ccc1e17573f879c2d49cecfe Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 17 Oct 2018 00:37:56 +0100
Subject: chore: Add topBar menu items to mobile drawer

---
 packages/website/ts/components/ui/button.tsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index ccaadc800..2a6a1f477 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -16,6 +16,7 @@ export interface ButtonProps {
     type?: string;
     isDisabled?: boolean;
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+    textAlign?: string;
 }
 
 const PlainButton: React.StatelessComponent<ButtonProps> = ({ children, isDisabled, onClick, type, className }) => (
@@ -35,6 +36,7 @@ export const Button = styled(PlainButton)`
     outline: none;
     font-family: ${props => props.fontFamily};
     width: ${props => props.width};
+    text-align: ${props => props.textAlign};
     background-color: ${props => props.backgroundColor};
     border: ${props => (props.borderColor ? `1px solid ${props.borderColor}` : 'none')};
     &:hover {
@@ -59,6 +61,7 @@ Button.defaultProps = {
     fontFamily: 'Roboto',
     isDisabled: false,
     padding: '0.8em 2.2em',
+    textAlign: 'center',
 };
 
 Button.displayName = 'Button';
-- 
cgit v1.2.3


From 8c6de7f69dc1d2bc543456782c5e70e105026301 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 13:59:40 +0100
Subject: chore: replace @0xproject with @0x in .tsx files

---
 packages/website/ts/components/ui/alert.tsx                   | 2 +-
 packages/website/ts/components/ui/allowance_state_view.tsx    | 2 +-
 packages/website/ts/components/ui/balance.tsx                 | 2 +-
 packages/website/ts/components/ui/copy_icon.tsx               | 2 +-
 packages/website/ts/components/ui/custom_menu_item.tsx        | 2 +-
 packages/website/ts/components/ui/ethereum_address.tsx        | 2 +-
 packages/website/ts/components/ui/etherscan_icon.tsx          | 2 +-
 packages/website/ts/components/ui/fake_text_field.tsx         | 2 +-
 packages/website/ts/components/ui/icon_button.tsx             | 2 +-
 packages/website/ts/components/ui/input.tsx                   | 2 +-
 packages/website/ts/components/ui/input_label.tsx             | 2 +-
 packages/website/ts/components/ui/lifecycle_raised_button.tsx | 4 ++--
 packages/website/ts/components/ui/party.tsx                   | 2 +-
 packages/website/ts/components/ui/pointer.tsx                 | 2 +-
 packages/website/ts/components/ui/required_label.tsx          | 2 +-
 packages/website/ts/components/ui/simple_menu.tsx             | 2 +-
 packages/website/ts/components/ui/spinner.tsx                 | 2 +-
 packages/website/ts/components/ui/swap_icon.tsx               | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/alert.tsx b/packages/website/ts/components/ui/alert.tsx
index b571d8c1c..32e0f1be8 100644
--- a/packages/website/ts/components/ui/alert.tsx
+++ b/packages/website/ts/components/ui/alert.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { AlertTypes } from 'ts/types';
 
diff --git a/packages/website/ts/components/ui/allowance_state_view.tsx b/packages/website/ts/components/ui/allowance_state_view.tsx
index 93d6b0ebb..fc754421a 100644
--- a/packages/website/ts/components/ui/allowance_state_view.tsx
+++ b/packages/website/ts/components/ui/allowance_state_view.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Spinner } from 'ts/components/ui/spinner';
diff --git a/packages/website/ts/components/ui/balance.tsx b/packages/website/ts/components/ui/balance.tsx
index 9e5a256b6..a1a8ff89b 100644
--- a/packages/website/ts/components/ui/balance.tsx
+++ b/packages/website/ts/components/ui/balance.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index 0330d1843..59e398cb6 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
index c25da6be6..87ce32126 100644
--- a/packages/website/ts/components/ui/custom_menu_item.tsx
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@0xproject/react-shared';
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx
index f449a8e75..71d98af56 100644
--- a/packages/website/ts/components/ui/ethereum_address.tsx
+++ b/packages/website/ts/components/ui/ethereum_address.tsx
@@ -1,4 +1,4 @@
-import { EtherscanLinkSuffixes } from '@0xproject/react-shared';
+import { EtherscanLinkSuffixes } from '@0x/react-shared';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import { EtherScanIcon } from 'ts/components/ui/etherscan_icon';
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 0beb69123..57ab91ba2 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/fake_text_field.tsx b/packages/website/ts/components/ui/fake_text_field.tsx
index ac3c30fec..7c3a482a4 100644
--- a/packages/website/ts/components/ui/fake_text_field.tsx
+++ b/packages/website/ts/components/ui/fake_text_field.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 import { InputLabel } from 'ts/components/ui/input_label';
 
diff --git a/packages/website/ts/components/ui/icon_button.tsx b/packages/website/ts/components/ui/icon_button.tsx
index 13cd239da..9f469ec69 100644
--- a/packages/website/ts/components/ui/icon_button.tsx
+++ b/packages/website/ts/components/ui/icon_button.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/input.tsx b/packages/website/ts/components/ui/input.tsx
index e01a71a53..e5f4f6c70 100644
--- a/packages/website/ts/components/ui/input.tsx
+++ b/packages/website/ts/components/ui/input.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 8eda45a5d..e7afb5a17 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface InputLabelProps {
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 0bb99b9d8..a8daf4102 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { errorUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { errorUtils } from '@0x/utils';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index a25550475..6c0572437 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/pointer.tsx b/packages/website/ts/components/ui/pointer.tsx
index db0a4188d..c97b1e700 100644
--- a/packages/website/ts/components/ui/pointer.tsx
+++ b/packages/website/ts/components/ui/pointer.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx
index 0f96586ec..5080462fa 100644
--- a/packages/website/ts/components/ui/required_label.tsx
+++ b/packages/website/ts/components/ui/required_label.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface RequiredLabelProps {
diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx
index bdaf0701e..45ee752e3 100644
--- a/packages/website/ts/components/ui/simple_menu.tsx
+++ b/packages/website/ts/components/ui/simple_menu.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@0xproject/react-shared';
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
diff --git a/packages/website/ts/components/ui/spinner.tsx b/packages/website/ts/components/ui/spinner.tsx
index e8670cc3e..dc73e74e3 100644
--- a/packages/website/ts/components/ui/spinner.tsx
+++ b/packages/website/ts/components/ui/spinner.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index f1d1ae7d4..406da8fe1 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 interface SwapIconProps {
-- 
cgit v1.2.3


From 0affc7682fa1a7484bb77cc460e9b9d10553980f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 14:06:12 +0100
Subject: chore: fix imports

---
 packages/website/ts/components/ui/button.tsx | 2 +-
 packages/website/ts/components/ui/text.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 2a6a1f477..92f927843 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken, saturate } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 4415962b1..c13e21913 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
-- 
cgit v1.2.3


From 3b421ef796638caf4e8d3bc2c7339b94d5e2026d Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Mon, 5 Nov 2018 12:59:10 -0800
Subject: fix(website): fix code splitting

---
 packages/website/ts/components/ui/copy_icon.tsx        | 2 +-
 packages/website/ts/components/ui/ethereum_address.tsx | 2 +-
 packages/website/ts/components/ui/etherscan_icon.tsx   | 2 +-
 packages/website/ts/components/ui/help_tooltip.tsx     | 2 +-
 packages/website/ts/components/ui/identicon.tsx        | 2 +-
 packages/website/ts/components/ui/party.tsx            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/website/ts/components/ui')

diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index 59e398cb6..403cd4607 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -2,7 +2,7 @@ import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
-import ReactTooltip = require('react-tooltip');
+import ReactTooltip from 'react-tooltip';
 
 interface CopyIconProps {
     data: string;
diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx
index 71d98af56..12f8636eb 100644
--- a/packages/website/ts/components/ui/ethereum_address.tsx
+++ b/packages/website/ts/components/ui/ethereum_address.tsx
@@ -1,6 +1,6 @@
 import { EtherscanLinkSuffixes } from '@0x/react-shared';
 import * as React from 'react';
-import ReactTooltip = require('react-tooltip');
+import ReactTooltip from 'react-tooltip';
 import { EtherScanIcon } from 'ts/components/ui/etherscan_icon';
 import { utils } from 'ts/utils/utils';
 
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 57ab91ba2..a7fba8a33 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,7 +1,7 @@
 import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import ReactTooltip = require('react-tooltip');
+import ReactTooltip from 'react-tooltip';
 
 interface EtherScanIconProps {
     addressOrTxHash: string;
diff --git a/packages/website/ts/components/ui/help_tooltip.tsx b/packages/website/ts/components/ui/help_tooltip.tsx
index d827eebb9..831d888f5 100644
--- a/packages/website/ts/components/ui/help_tooltip.tsx
+++ b/packages/website/ts/components/ui/help_tooltip.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import ReactTooltip = require('react-tooltip');
+import ReactTooltip from 'react-tooltip';
 
 interface HelpTooltipProps {
     style?: React.CSSProperties;
diff --git a/packages/website/ts/components/ui/identicon.tsx b/packages/website/ts/components/ui/identicon.tsx
index b5b374973..9eca04a5d 100644
--- a/packages/website/ts/components/ui/identicon.tsx
+++ b/packages/website/ts/components/ui/identicon.tsx
@@ -1,4 +1,4 @@
-import blockies = require('blockies');
+import blockies from 'blockies';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index 6c0572437..f9e0967d4 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -1,7 +1,7 @@
 import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import ReactTooltip = require('react-tooltip');
+import ReactTooltip from 'react-tooltip';
 import { EthereumAddress } from 'ts/components/ui/ethereum_address';
 import { Identicon } from 'ts/components/ui/identicon';
 
-- 
cgit v1.2.3