diff options
author | Francesco Agosti <francesco.agosti93@gmail.com> | 2018-06-06 04:16:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 04:16:10 +0800 |
commit | e1b06bfce26c286b265ef47948216f9e4097477f (patch) | |
tree | 2f4600a7d289631963141f415bf5ac4572f1619c /packages/website/ts/components/wallet | |
parent | 44a736c53b8901ee36dbe009ad570930bbc8e676 (diff) | |
parent | 8de3f03b4982f14459b10a0ef1d60ab713d5c7be (diff) | |
download | dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar.gz dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar.bz2 dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar.lz dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar.xz dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.tar.zst dexon-0x-contracts-e1b06bfce26c286b265ef47948216f9e4097477f.zip |
Merge pull request #652 from 0xProject/feature/website/landing-subscribe-button-2
Implement subscribe form on landing page
Diffstat (limited to 'packages/website/ts/components/wallet')
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 7059ca350..4383179a1 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -32,6 +32,8 @@ import { TokenIcon } from 'ts/components/ui/token_icon'; import { WalletDisconnectedItem } from 'ts/components/wallet/wallet_disconnected_item'; import { WrapEtherItem } from 'ts/components/wallet/wrap_ether_item'; import { Dispatcher } from 'ts/redux/dispatcher'; +import { colors } from 'ts/style/colors'; +import { zIndex } from 'ts/style/z_index'; import { BalanceErrs, BlockchainErrs, @@ -46,9 +48,7 @@ import { WebsitePaths, } from 'ts/types'; import { backendClient } from 'ts/utils/backend_client'; -import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; -import { zIndex } from 'ts/utils/style'; import { utils } from 'ts/utils/utils'; import { styles as walletItemStyles } from 'ts/utils/wallet_item_styles'; diff --git a/packages/website/ts/components/wallet/wallet_disconnected_item.tsx b/packages/website/ts/components/wallet/wallet_disconnected_item.tsx index 17fd8a19e..e3b88dc54 100644 --- a/packages/website/ts/components/wallet/wallet_disconnected_item.tsx +++ b/packages/website/ts/components/wallet/wallet_disconnected_item.tsx @@ -3,8 +3,8 @@ import FlatButton from 'material-ui/FlatButton'; import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet'; import * as React from 'react'; +import { colors } from 'ts/style/colors'; import { ProviderType } from 'ts/types'; -import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { utils } from 'ts/utils/utils'; diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx index 1dfcffadf..50b64d05c 100644 --- a/packages/website/ts/components/wallet/wrap_ether_item.tsx +++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx @@ -10,8 +10,8 @@ import { Blockchain } from 'ts/blockchain'; import { EthAmountInput } from 'ts/components/inputs/eth_amount_input'; import { TokenAmountInput } from 'ts/components/inputs/token_amount_input'; import { Dispatcher } from 'ts/redux/dispatcher'; +import { colors } from 'ts/style/colors'; import { BlockchainCallErrs, Side, Token } from 'ts/types'; -import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { errorReporter } from 'ts/utils/error_reporter'; import { utils } from 'ts/utils/utils'; |