diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-21 02:01:30 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-21 02:01:30 +0800 |
commit | 24173ee7cb972dcaba6555aa565e3d426a2d94e1 (patch) | |
tree | d2c8051d2f456614a1f520353e9132e2bba836e6 /ui/app/components/binary-renderer.js | |
parent | b6e2eaf7b1d14fcca8ed614791937a5ccbfc00dd (diff) | |
parent | f3da24cd04a2ca74d5006d6b615a7f26d8b5dfa3 (diff) | |
download | tangerine-wallet-browser-24173ee7cb972dcaba6555aa565e3d426a2d94e1.tar.gz tangerine-wallet-browser-24173ee7cb972dcaba6555aa565e3d426a2d94e1.tar.zst tangerine-wallet-browser-24173ee7cb972dcaba6555aa565e3d426a2d94e1.zip |
Merge branch 'master' into i1181-RemoveLightwallet
Diffstat (limited to 'ui/app/components/binary-renderer.js')
-rw-r--r-- | ui/app/components/binary-renderer.js | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/ui/app/components/binary-renderer.js b/ui/app/components/binary-renderer.js index a9d49b128..0b6a1f5c2 100644 --- a/ui/app/components/binary-renderer.js +++ b/ui/app/components/binary-renderer.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const ethUtil = require('ethereumjs-util') +const extend = require('xtend') module.exports = BinaryRenderer @@ -12,20 +13,22 @@ function BinaryRenderer () { BinaryRenderer.prototype.render = function () { const props = this.props - const { value } = props + const { value, style } = props const text = this.hexToText(value) + const defaultStyle = extend({ + width: '315px', + maxHeight: '210px', + resize: 'none', + border: 'none', + background: 'white', + padding: '3px', + }, style) + return ( h('textarea.font-small', { readOnly: true, - style: { - width: '315px', - maxHeight: '210px', - resize: 'none', - border: 'none', - background: 'white', - padding: '3px', - }, + style: defaultStyle, defaultValue: text, }) ) |