diff options
author | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
commit | 9d215bab0fe124f036d2ac41f375331c8d43b72b (patch) | |
tree | 6bbbdb2e6a2dcd5948ee8473cad152232c73643b /ui/app/components/dropdowns/network-dropdown.js | |
parent | f06bca1151b07d908cd90f6efd97064e288e5f27 (diff) | |
parent | 9762a730413129361062804aa8dfc7be7cf74868 (diff) | |
download | tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.gz tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.zst tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.zip |
Merge branch 'master' into i18n
Diffstat (limited to 'ui/app/components/dropdowns/network-dropdown.js')
-rw-r--r-- | ui/app/components/dropdowns/network-dropdown.js | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 0e16048d5..67daaa5fd 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -85,7 +85,7 @@ NetworkDropdown.prototype.render = function () { style: { position: 'absolute', top: '58px', - minWidth: '309px', + width: '309px', zIndex: '55px', }, innerStyle: { @@ -277,11 +277,21 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { key: `common${rpc}`, closeMenu: () => this.props.hideNetworkDropdown(), onClick: () => props.setRpcTarget(rpc), + style: { + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '20px', + padding: '12px 0', + }, }, [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - rpc, - rpcTarget === rpc ? h('.check', '✓') : null, + rpcTarget === rpc ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h('i.fa.fa-question-circle.fa-med.menu-icon-circle'), + h('span.network-name-item', { + style: { + color: rpcTarget === rpc ? '#ffffff' : '#9b9b9b', + }, + }, rpc), ] ) } @@ -294,12 +304,6 @@ NetworkDropdown.prototype.renderCustomOption = function (provider) { if (type !== 'rpc') return null - // Concatenate long URLs - let label = rpcTarget - if (rpcTarget.length > 31) { - label = label.substr(0, 34) + '...' - } - switch (rpcTarget) { case 'http://localhost:8545': @@ -312,11 +316,21 @@ NetworkDropdown.prototype.renderCustomOption = function (provider) { key: rpcTarget, onClick: () => props.setRpcTarget(rpcTarget), closeMenu: () => this.props.hideNetworkDropdown(), + style: { + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '20px', + padding: '12px 0', + }, }, [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - label, - h('.check', '✓'), + h('i.fa.fa-check'), + h('i.fa.fa-question-circle.fa-med.menu-icon-circle'), + h('span.network-name-item', { + style: { + color: '#ffffff', + }, + }, rpcTarget), ] ) } |