diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-05-09 02:12:46 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-05-09 02:12:46 +0800 |
| commit | 17f3d5f6bac178ffda6060eea227ef8deaaf73aa (patch) | |
| tree | 2b31258b15d1c3a0ec549dfc4d121e3274f71f88 /packages/website/ts/components/portal | |
| parent | 607d738342a839788b59e0dee63849ea447331bc (diff) | |
| download | dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar.gz dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar.bz2 dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar.lz dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar.xz dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.tar.zst dexon-sol-tools-17f3d5f6bac178ffda6060eea227ef8deaaf73aa.zip | |
Suggestions and fix bad merge
Diffstat (limited to 'packages/website/ts/components/portal')
| -rw-r--r-- | packages/website/ts/components/portal/portal.tsx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx index 88003a94e..d359219cd 100644 --- a/packages/website/ts/components/portal/portal.tsx +++ b/packages/website/ts/components/portal/portal.tsx @@ -9,11 +9,7 @@ import { BlockchainErrDialog } from 'ts/components/dialogs/blockchain_err_dialog import { LedgerConfigDialog } from 'ts/components/dialogs/ledger_config_dialog'; import { PortalDisclaimerDialog } from 'ts/components/dialogs/portal_disclaimer_dialog'; import { RelayerIndex } from 'ts/components/relayer_index/relayer_index'; -<<<<<<< HEAD import { TopBar, TopBarDisplayType } from 'ts/components/top_bar/top_bar'; -======= -import { TopBar } from 'ts/components/top_bar/top_bar'; ->>>>>>> development import { FlashMessage } from 'ts/components/ui/flash_message'; import { Wallet } from 'ts/components/wallet/wallet'; import { localStorage } from 'ts/local_storage/local_storage'; @@ -55,11 +51,7 @@ interface PortalState { } const THROTTLE_TIMEOUT = 100; -<<<<<<< HEAD const TOP_BAR_HEIGHT = TopBar.heightForDisplayType(TopBarDisplayType.Expanded); -======= -const TOP_BAR_HEIGHT = 60; ->>>>>>> development const styles: Styles = { root: { @@ -71,7 +63,6 @@ const styles: Styles = { height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`, }, scrollContainer: { - overflowZ: 'hidden', height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`, WebkitOverflowScrolling: 'touch', overflow: 'auto', |