diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 03:25:25 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 03:25:25 +0800 |
| commit | 3395b8d095a62e5baa4c049da98b256ce596d6b9 (patch) | |
| tree | b9241ba7299fdcc5f7a5e1f17cad7a4a95ae203d /packages/instant/src/components/zero_ex_instant_container.tsx | |
| parent | 88eb642aa543673bde52c1d14fc1f3e92d8b2137 (diff) | |
| parent | b388d5496272d535b5c192a7098f4227bb1fb3f2 (diff) | |
| download | dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.gz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.bz2 dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.lz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.xz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.zst dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/dropdown-ui
Diffstat (limited to 'packages/instant/src/components/zero_ex_instant_container.tsx')
| -rw-r--r-- | packages/instant/src/components/zero_ex_instant_container.tsx | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx index 3c43f0be6..575093c46 100644 --- a/packages/instant/src/components/zero_ex_instant_container.tsx +++ b/packages/instant/src/components/zero_ex_instant_container.tsx @@ -10,6 +10,7 @@ import { ColorOption } from '../style/theme'; import { zIndex } from '../style/z_index'; import { SlideAnimationState } from './animations/slide_animation'; +import { CSSReset } from './css_reset'; import { PaymentMethod } from './payment_method'; import { SlidingPanel } from './sliding_panel'; import { Container } from './ui/container'; @@ -26,41 +27,44 @@ export class ZeroExInstantContainer extends React.Component<ZeroExInstantContain }; public render(): React.ReactNode { return ( - <Container - width={{ default: '350px', sm: '100%' }} - height={{ default: 'auto', sm: '100%' }} - position="relative" - > - <Container zIndex={zIndex.errorPopup} position="relative"> - <LatestError /> - </Container> + <React.Fragment> + <CSSReset /> <Container - zIndex={zIndex.mainContainer} + width={{ default: '350px', sm: '100%' }} + height={{ default: 'auto', sm: '100%' }} position="relative" - backgroundColor={ColorOption.white} - borderRadius="3px" - hasBoxShadow={true} - overflow="hidden" - height="100%" > - <Flex direction="column" height="100%" justify="flex-start"> - <SelectedAssetInstantHeading onSelectAssetClick={this._handleSymbolClick} /> - <PaymentMethod /> - <SelectedAssetBuyOrderProgress /> - <LatestBuyQuoteOrderDetails /> - <Container padding="20px" width="100%"> - <SelectedAssetBuyOrderStateButtons /> - </Container> - </Flex> - <SlidingPanel - title="Select Token" - animationState={this.state.tokenSelectionPanelAnimationState} - onClose={this._handlePanelClose} + <Container zIndex={zIndex.errorPopup} position="relative"> + <LatestError /> + </Container> + <Container + zIndex={zIndex.mainContainer} + position="relative" + backgroundColor={ColorOption.white} + borderRadius="3px" + hasBoxShadow={true} + overflow="hidden" + height="100%" > - <AvailableERC20TokenSelector onTokenSelect={this._handlePanelClose} /> - </SlidingPanel> + <Flex direction="column" justify="flex-start" height="100%"> + <SelectedAssetInstantHeading onSelectAssetClick={this._handleSymbolClick} /> + <SelectedAssetBuyOrderProgress /> + <PaymentMethod /> + <LatestBuyQuoteOrderDetails /> + <Container padding="20px" width="100%"> + <SelectedAssetBuyOrderStateButtons /> + </Container> + </Flex> + <SlidingPanel + title="Select Token" + animationState={this.state.tokenSelectionPanelAnimationState} + onClose={this._handlePanelClose} + > + <AvailableERC20TokenSelector onTokenSelect={this._handlePanelClose} /> + </SlidingPanel> + </Container> </Container> - </Container> + </React.Fragment> ); } private readonly _handleSymbolClick = (): void => { |