diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-06-02 08:28:04 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-02 08:28:04 +0800 |
commit | 95086a75e6d08b930c196ccf6d0926c4e0f4cd48 (patch) | |
tree | de4159b6af049cdc7df34a30da55c1535754115f /packages/website/ts/components/portal | |
parent | 62e60e2ba6d07b9b892b4f2e92a5421c54f5fa20 (diff) | |
parent | 073a96cf63a8b2e5639d15133d09545f7bde1388 (diff) | |
download | dexon-0x-contracts-95086a75e6d08b930c196ccf6d0926c4e0f4cd48.tar.gz dexon-0x-contracts-95086a75e6d08b930c196ccf6d0926c4e0f4cd48.tar.zst dexon-0x-contracts-95086a75e6d08b930c196ccf6d0926c4e0f4cd48.zip |
Merge branch 'feature/website/landing-subscribe-button' into feature/website/landing-subscribe-button-2
Diffstat (limited to 'packages/website/ts/components/portal')
-rw-r--r-- | packages/website/ts/components/portal/back_button.tsx | 2 | ||||
-rw-r--r-- | packages/website/ts/components/portal/drawer_menu.tsx | 2 | ||||
-rw-r--r-- | packages/website/ts/components/portal/menu.tsx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx index 48858613c..2d0bbefc3 100644 --- a/packages/website/ts/components/portal/back_button.tsx +++ b/packages/website/ts/components/portal/back_button.tsx @@ -2,7 +2,7 @@ import { Styles } from '@0xproject/react-shared'; import * as React from 'react'; import { Link } from 'react-router-dom'; -import { colors } from 'ts/utils/colors'; +import { colors } from 'ts/style/colors'; export interface BackButtonProps { to: string; diff --git a/packages/website/ts/components/portal/drawer_menu.tsx b/packages/website/ts/components/portal/drawer_menu.tsx index ace11639a..8ac2b9091 100644 --- a/packages/website/ts/components/portal/drawer_menu.tsx +++ b/packages/website/ts/components/portal/drawer_menu.tsx @@ -4,8 +4,8 @@ import * as React from 'react'; import { defaultMenuItemEntries, Menu } from 'ts/components/portal/menu'; import { Identicon } from 'ts/components/ui/identicon'; +import { colors } from 'ts/style/colors'; import { WebsitePaths } from 'ts/types'; -import { colors } from 'ts/utils/colors'; import { utils } from 'ts/utils/utils'; const IDENTICON_DIAMETER = 45; diff --git a/packages/website/ts/components/portal/menu.tsx b/packages/website/ts/components/portal/menu.tsx index 6e97ee37e..f98346101 100644 --- a/packages/website/ts/components/portal/menu.tsx +++ b/packages/website/ts/components/portal/menu.tsx @@ -2,8 +2,8 @@ import { Styles } from '@0xproject/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import { MenuItem } from 'ts/components/ui/menu_item'; +import { colors } from 'ts/style/colors'; import { Environments, WebsitePaths } from 'ts/types'; -import { colors } from 'ts/utils/colors'; import { configs } from 'ts/utils/configs'; export interface MenuTheme { |