diff options
| author | Tom Schmidt <imtomhschmidt@gmail.com> | 2018-03-10 07:22:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 07:22:59 +0800 |
| commit | 47af38ecb8d59789af9db2079e18ee0b6e589786 (patch) | |
| tree | abd75e02d19d7c2e9c7b8df1ebe7152e2d364a40 /packages/website/ts/pages/landing | |
| parent | 654c790c3df3ee857952a1023761f186bb9c777d (diff) | |
| parent | 7116f100ee194f46d0e34782afa8f680791adc9c (diff) | |
| download | dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.gz dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.bz2 dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.lz dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.xz dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.zst dexon-sol-tools-47af38ecb8d59789af9db2079e18ee0b6e589786.zip | |
Merge branch 'development' into feature/website/web3-logging
Diffstat (limited to 'packages/website/ts/pages/landing')
| -rw-r--r-- | packages/website/ts/pages/landing/landing.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index 044f0b41f..6699e4e6f 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -1,3 +1,4 @@ +import { colors } from '@0xproject/react-shared'; import * as _ from 'lodash'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; @@ -7,7 +8,6 @@ import { Footer } from 'ts/components/footer'; import { TopBar } from 'ts/components/top_bar/top_bar'; import { Dispatcher } from 'ts/redux/dispatcher'; import { Deco, Key, Language, ScreenWidths, WebsitePaths } from 'ts/types'; -import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; import { utils } from 'ts/utils/utils'; |