diff options
author | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-01 12:16:07 +0800 |
---|---|---|
committer | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-01 12:16:07 +0800 |
commit | c876428044c8e6eec300ceeb0d7ab0c44e68f8d3 (patch) | |
tree | ecf3ce70d44c9be1a7f2d26226ce37fd7fca0645 /ui/app/main-container.js | |
parent | 92bd783e0c61e05772cc494a386bb5f21e9dbbb3 (diff) | |
download | tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar.gz tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar.bz2 tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar.lz tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar.xz tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.tar.zst tangerine-wallet-browser-c876428044c8e6eec300ceeb0d7ab0c44e68f8d3.zip |
Add TxView, use width percentages instead of flex-grow for layout
Diffstat (limited to 'ui/app/main-container.js')
-rw-r--r-- | ui/app/main-container.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js index cc61860b6..88028f8eb 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const WalletView = require('./components/wallet-view') +const TxView = require('./components/tx-view') module.exports = MainContainer @@ -20,6 +21,7 @@ MainContainer.prototype.render = function () { zIndex: 20, boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)', fontFamily: 'DIN OT', + display: 'flex', } }, [ h(WalletView, { @@ -30,11 +32,12 @@ MainContainer.prototype.render = function () { }, [ ]), - h('div.tx-view', { + h(TxView, { style: { - width: '66.66%', - height: '82vh', - background: '#FFFFFF', + // flexGrow: 2 + // width: '66.66%', + // height: '82vh', + // background: '#FFFFFF', } }, [ ]), |