diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:03:44 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:03:44 +0800 |
commit | e647337a8a34d8fb4b5a8081888ec32ce5fd27a0 (patch) | |
tree | 2060fcf05407d4cec876332a70d25418237a724d /ui/app/account-detail.js | |
parent | 45fc1d6ec356232e51fe4a9cc1f01929e35e8014 (diff) | |
parent | 2885a9547187ce1ad0fb3bed1935387d901942a8 (diff) | |
download | tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.gz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.bz2 tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.lz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.xz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.zst tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.zip |
Resolve merge conflict from master
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r-- | ui/app/account-detail.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 22a883096..02089ecd0 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -107,14 +107,23 @@ AccountDetailScreen.prototype.render = function () { }, [ h( - 'h2.font-medium.color-forest', + 'div.font-medium.color-forest', { name: 'edit', style: { }, }, [ - identity && identity.name, + h('h2', { + style: { + maxWidth: '180px', + overflow: 'hidden', + textOverflow: 'ellipsis', + padding: '5px 0px', + }, + }, [ + identity && identity.name, + ]), ] ), h( |