diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:19:10 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:30:18 +0800 |
| commit | ea564e51fcbd67223d13eb7d03136164fb3bdc9f (patch) | |
| tree | 4eec5aa90162e57b02563256b718570744f27a7c /ui/app | |
| parent | c152f987359de468cb53666f75aea525f22902dd (diff) | |
| download | tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar.gz tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar.bz2 tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar.lz tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar.xz tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.tar.zst tangerine-wallet-browser-ea564e51fcbd67223d13eb7d03136164fb3bdc9f.zip | |
Fix for lint err
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/account-detail.js | 14 | ||||
| -rw-r--r-- | ui/app/accounts/account-panel.js | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index dfafb60cb..f0d359106 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -130,13 +130,13 @@ AccountDetailScreen.prototype.render = function () { h('img.cursor-pointer.color-orange', { src: 'images/key-32.png', onClick: () => this.requestAccountExport(selected), - style:{ - margin: "0px 5px", - width: "20px", - height: "20px", - position: "relative", - top: "3px", - right: "4px", + style: { + margin: '0px 5px', + width: '20px', + height: '20px', + position: 'relative', + top: '3px', + right: '4px', }, }), diff --git a/ui/app/accounts/account-panel.js b/ui/app/accounts/account-panel.js index 1c9e84414..af3d0d347 100644 --- a/ui/app/accounts/account-panel.js +++ b/ui/app/accounts/account-panel.js @@ -67,12 +67,6 @@ NewComponent.prototype.render = function () { event.preventDefault() copyToClipboard(ethUtil.toChecksumAddress(identity.address)) }, -<<<<<<< HEAD - style:{ - margin: '0px 5px', - }, -======= ->>>>>>> master }), ]), ]) |