diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-08-12 00:50:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-12 00:50:05 +0800 |
| commit | 3b1ac178ef5e085bfa40706c5e628204bcc0c17b (patch) | |
| tree | 724d3872e9163d1ac7c22c443bfa43e6268960bb | |
| parent | 4b7fa27ad0e49deac076910f1579999415267575 (diff) | |
| parent | 9ec86636050c6d642ff5fa9bf3413d17ccba1a24 (diff) | |
| download | tangerine-wallet-browser-3b1ac178ef5e085bfa40706c5e628204bcc0c17b.tar.gz tangerine-wallet-browser-3b1ac178ef5e085bfa40706c5e628204bcc0c17b.tar.zst tangerine-wallet-browser-3b1ac178ef5e085bfa40706c5e628204bcc0c17b.zip | |
Merge pull request #1899 from sdtsui/fix/acct-name-lengths
Fix account name overflow issues
| -rw-r--r-- | ui/app/account-detail.js | 13 | ||||
| -rw-r--r-- | ui/app/app.js | 2 | ||||
| -rw-r--r-- | ui/app/components/account-dropdowns.js | 11 |
3 files changed, 22 insertions, 4 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 22a883096..f6041e856 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', + overflowX: 'hidden', + textOverflow: 'ellipsis', + padding: '5px 0px', + }, + }, [ + identity && identity.name, + ]), ] ), h( diff --git a/ui/app/app.js b/ui/app/app.js index 4565bdd37..1f3d5b0f8 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -185,7 +185,7 @@ App.prototype.renderAppBar = function () { style: {}, enableAccountsSelector: true, identities: this.props.identities, - selected: this.props.selected, + selected: this.props.currentView.context, network: this.props.network, }, []), diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index b23600e9b..7c24e70bd 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -51,7 +51,16 @@ class AccountDropdowns extends Component { }, }, ), - 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), ] ) |