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/components/ui/lifecycle_raised_button.tsx | |
| parent | 654c790c3df3ee857952a1023761f186bb9c777d (diff) | |
| parent | 7116f100ee194f46d0e34782afa8f680791adc9c (diff) | |
| download | dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.gz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.bz2 dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.lz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.xz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.zst dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.zip | |
Merge branch 'development' into feature/website/web3-logging
Diffstat (limited to 'packages/website/ts/components/ui/lifecycle_raised_button.tsx')
| -rw-r--r-- | packages/website/ts/components/ui/lifecycle_raised_button.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index 8ff856a75..c85e11884 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -1,7 +1,7 @@ +import { colors } from '@0xproject/react-shared'; import * as _ from 'lodash'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; -import { colors } from 'ts/utils/colors'; import { utils } from 'ts/utils/utils'; const COMPLETE_STATE_SHOW_LENGTH_MS = 2000; |