aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/account-dropdowns.js
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:03:44 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:03:44 +0800
commite647337a8a34d8fb4b5a8081888ec32ce5fd27a0 (patch)
tree2060fcf05407d4cec876332a70d25418237a724d /ui/app/components/account-dropdowns.js
parent45fc1d6ec356232e51fe4a9cc1f01929e35e8014 (diff)
parent2885a9547187ce1ad0fb3bed1935387d901942a8 (diff)
downloadtangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.gz
tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.zst
tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.zip
Resolve merge conflict from master
Diffstat (limited to 'ui/app/components/account-dropdowns.js')
-rw-r--r--ui/app/components/account-dropdowns.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js
index 9a68b8f20..c23f61c98 100644
--- a/ui/app/components/account-dropdowns.js
+++ b/ui/app/components/account-dropdowns.js
@@ -59,7 +59,16 @@ class AccountDropdowns extends Component {
},
),
this.indicateIfLoose(keyring.type),
- h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, identity.name || ''),
+ h('span', {
+ style: {
+ marginLeft: '20px',
+ fontSize: '24px',
+ maxWidth: '145px',
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ },
+ }, identity.name || ''),
h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null),
]
)