From 67f10d660f1a7f5875253eb0de097e1fab9ad912 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 17:03:14 -0700 Subject: Adjust account checksumAddress location up --- ui/app/account-detail.js | 1 + 1 file changed, 1 insertion(+) (limited to 'ui') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 24561c32e..a233c6861 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -145,6 +145,7 @@ AccountDetailScreen.prototype.render = function () { h('div', { style: { + marginTop: '-10px', overflow: 'hidden', textOverflow: 'ellipsis', paddingTop: '3px', -- cgit From ecb09fcc0aa801f553cd83659c06c429b5cfbf33 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 17:08:19 -0700 Subject: Disable account selection dropdown from account details --- ui/app/account-detail.js | 3 +-- ui/app/components/account-dropdowns.js | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'ui') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index a233c6861..22a883096 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -128,6 +128,7 @@ AccountDetailScreen.prototype.render = function () { selected, network, identities: props.identities, + enableAccountOptions: true, }, ), ] @@ -145,7 +146,6 @@ AccountDetailScreen.prototype.render = function () { h('div', { style: { - marginTop: '-10px', overflow: 'hidden', textOverflow: 'ellipsis', paddingTop: '3px', @@ -153,7 +153,6 @@ AccountDetailScreen.prototype.render = function () { fontSize: '13px', fontFamily: 'Montserrat Light', textRendering: 'geometricPrecision', - marginTop: '10px', marginBottom: '15px', color: '#AEAEAE', }, diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 79e6cff59..8d8cb211e 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -183,7 +183,7 @@ class AccountDropdowns extends Component { } render () { - const { style } = this.props + const { style, enableAccountsSelector, enableAccountOptions } = this.props const { optionsMenuActive, accountSelectorActive } = this.state return h( @@ -192,10 +192,12 @@ class AccountDropdowns extends Component { style: style, }, [ - h( + enableAccountsSelector && h( 'i.fa.fa-angle-down', { - style: {}, + style: { + fontSize: '1.8em', + }, onClick: (event) => { event.stopPropagation() this.setState({ @@ -206,10 +208,13 @@ class AccountDropdowns extends Component { }, this.renderAccountSelector(), ), - h( + enableAccountOptions && h( 'i.fa.fa-ellipsis-h', { - style: { 'marginLeft': '10px'}, + style: { + marginRight: '0.5em', + fontSize: '1.8em', + }, onClick: (event) => { event.stopPropagation() this.setState({ @@ -225,6 +230,11 @@ class AccountDropdowns extends Component { } } +AccountDropdowns.defaultProps = { + enableAccountsSelector: false, + enableAccountOptions: false, +} + AccountDropdowns.propTypes = { identities: PropTypes.objectOf(PropTypes.object), selected: PropTypes.string, -- cgit From 850e9b63d297c9da2403bb3796445df3cd500600 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 17:17:00 -0700 Subject: Move accountselector menu-droppo up to app-header --- ui/app/app.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'ui') diff --git a/ui/app/app.js b/ui/app/app.js index e23caa72b..bafc13d32 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -30,6 +30,8 @@ const QrView = require('./components/qr-code') const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete') const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation') +const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns +const ethUtil = require('ethereumjs-util') module.exports = connect(mapStateToProps)(App) @@ -37,6 +39,14 @@ inherits(App, Component) function App () { Component.call(this) } function mapStateToProps (state) { + const { + identities, + accounts, + address, + } = state.metamask + let selected = address || Object.keys(accounts)[0] + // let checksumAddress = selected && ethUtil.toChecksumAddress(selected) + return { // state from plugin isLoading: state.appState.isLoading, @@ -57,6 +67,10 @@ function mapStateToProps (state) { lastUnreadNotice: state.metamask.lastUnreadNotice, lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], + + // state needed to get account dropdown temporarily rendering from app bar + identities, + selected, } } @@ -169,6 +183,14 @@ App.prototype.renderAppBar = function () { }, }, [ + props.isUnlocked && h(AccountDropdowns, { + style: {}, + enableAccountsSelector: true, + identities: this.props.identities, + selected: this.props.selected, + network: this.props.network, + }, []), + // hamburger props.isUnlocked && h(SandwichExpando, { width: 16, -- cgit From aff213e845dcea49946f9a26d4b44a35082cd5f3 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 17:49:23 -0700 Subject: Position account switcher icon back in app header --- ui/app/components/account-dropdowns.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 8d8cb211e..906b3315b 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -193,10 +193,14 @@ class AccountDropdowns extends Component { }, [ enableAccountsSelector && h( - 'i.fa.fa-angle-down', + 'div.cursor-pointer.color-orange', { style: { - fontSize: '1.8em', + background: 'url(images/switch_acc.svg) white center center no-repeat', + height: '25px', + width: '25px', + transform: 'scale(0.75)', + marginRight: '3px', }, onClick: (event) => { event.stopPropagation() -- cgit From 4d6a289629fdfb404251386564720a3a586fe79a Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 17:50:00 -0700 Subject: Add note with previous fa-angle-down for future refactor --- ui/app/components/account-dropdowns.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 906b3315b..33daecd38 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -193,9 +193,11 @@ class AccountDropdowns extends Component { }, [ enableAccountsSelector && h( + // 'i.fa.fa-angle-down', 'div.cursor-pointer.color-orange', { style: { + // fontSize: '1.8em', background: 'url(images/switch_acc.svg) white center center no-repeat', height: '25px', width: '25px', -- cgit From 10d3a519c881763d4b79876bb1fde6c8243c3427 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 18:35:10 -0700 Subject: De-dupe click handler for sandwich-expando --- ui/app/app.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'ui') diff --git a/ui/app/app.js b/ui/app/app.js index bafc13d32..fda48f41d 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -193,15 +193,17 @@ App.prototype.renderAppBar = function () { // hamburger props.isUnlocked && h(SandwichExpando, { + className: 'sandwich-expando', width: 16, barHeight: 2, padding: 0, isOpen: state.isMainMenuOpen, color: 'rgb(247,146,30)', - onClick: (event) => { - event.preventDefault() + onClick: () => { event.stopPropagation() - this.setState({ isMainMenuOpen: !state.isMainMenuOpen }) + this.setState({ + isMainMenuOpen: !state.isMainMenuOpen, + }) }, }), ]), @@ -340,9 +342,13 @@ App.prototype.renderDropdown = function () { isOpen: isOpen, zIndex: 11, onClickOutside: (event) => { - const { classList } = event.target - const isNotToggleElement = !classList.contains('sandwich-expando') - if (isNotToggleElement) { + const classList = event.target.classList + const parentClassList = event.target.parentElement.classList + + const isToggleElement = classList.contains('sandwich-expando') || + parentClassList.contains('sandwich-expando') + + if (isOpen && !isToggleElement) { this.setState({ isMainMenuOpen: false }) } }, -- cgit From 086441e41c3a06cb062a475b59b542aa4ea6f185 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 18:50:29 -0700 Subject: Increase size of network dropdown --- ui/app/app.js | 18 ++++++++++++++++++ ui/app/components/dropdown.js | 3 ++- ui/app/css/index.css | 2 +- ui/app/css/lib.css | 9 +++++++-- 4 files changed, 28 insertions(+), 4 deletions(-) (limited to 'ui') diff --git a/ui/app/app.js b/ui/app/app.js index fda48f41d..2566a7515 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -251,6 +251,9 @@ App.prototype.renderNetworkDropdown = function () { key: 'main', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('mainnet')), + style: { + fontSize: '18px' + }, }, [ h('.menu-icon.diamond'), @@ -265,6 +268,9 @@ App.prototype.renderNetworkDropdown = function () { key: 'ropsten', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('ropsten')), + style: { + fontSize: '18px' + }, }, [ h('.menu-icon.red-dot'), @@ -279,6 +285,9 @@ App.prototype.renderNetworkDropdown = function () { key: 'kovan', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('kovan')), + style: { + fontSize: '18px' + }, }, [ h('.menu-icon.hollow-diamond'), @@ -293,6 +302,9 @@ App.prototype.renderNetworkDropdown = function () { key: 'rinkeby', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('rinkeby')), + style: { + fontSize: '18px' + }, }, [ h('.menu-icon.golden-square'), @@ -307,6 +319,9 @@ App.prototype.renderNetworkDropdown = function () { key: 'default', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setDefaultRpcTarget()), + style: { + fontSize: '18px' + }, }, [ h('i.fa.fa-question-circle.fa-lg.menu-icon'), @@ -323,6 +338,9 @@ App.prototype.renderNetworkDropdown = function () { { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => this.props.dispatch(actions.showConfigPage()), + style: { + fontSize: '18px' + }, }, [ h('i.fa.fa-question-circle.fa-lg.menu-icon'), diff --git a/ui/app/components/dropdown.js b/ui/app/components/dropdown.js index 759800fd6..993a104ee 100644 --- a/ui/app/components/dropdown.js +++ b/ui/app/components/dropdown.js @@ -54,7 +54,7 @@ Dropdown.propTypes = { class DropdownMenuItem extends Component { render () { - const { onClick, closeMenu, children } = this.props + const { onClick, closeMenu, children, style } = this.props return h( 'li.dropdown-menu-item', @@ -73,6 +73,7 @@ class DropdownMenuItem extends Component { display: 'flex', justifyContent: 'flex-start', alignItems: 'center', + ...style, }, }, children diff --git a/ui/app/css/index.css b/ui/app/css/index.css index e9a70b3a2..49b432a1f 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -201,7 +201,7 @@ textarea.twelve-word-phrase { } .check { - margin-left: 7px; + margin-left: 12px; color: #F7861C; flex: 1 0 auto; display: flex; diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css index 98570859a..6fff4f56a 100644 --- a/ui/app/css/lib.css +++ b/ui/app/css/lib.css @@ -238,10 +238,15 @@ hr.horizontal-line { .menu-icon { display: inline-block; - height: 9px; - min-width: 9px; + height: 12px; + min-width: 12px; margin: 13px; } + +i.fa.fa-question-circle.fa-lg.menu-icon { + font-size: 18px; +} + .ether-icon { background: rgb(0, 163, 68); border-radius: 20px; -- cgit From 36d8c3dd3984d37fb72115464f862d89d1559763 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 18:55:11 -0700 Subject: Increase size of settings dropdown and account settings dropdown --- ui/app/components/account-dropdowns.js | 2 +- ui/app/components/dropdown.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 33daecd38..faad31422 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -119,7 +119,7 @@ class AccountDropdowns extends Component { Dropdown, { style: { - marginLeft: '-162px', + marginLeft: '-215px', minWidth: '180px', }, isOpen: optionsMenuActive, diff --git a/ui/app/components/dropdown.js b/ui/app/components/dropdown.js index 993a104ee..b99e0aa9a 100644 --- a/ui/app/components/dropdown.js +++ b/ui/app/components/dropdown.js @@ -66,7 +66,7 @@ class DropdownMenuItem extends Component { style: { listStyle: 'none', padding: '8px 0px 8px 0px', - fontSize: '12px', + fontSize: '18px', fontStyle: 'normal', fontFamily: 'Montserrat Regular', cursor: 'pointer', -- cgit From 28fd016d12a73c92a2fa8492de4072520d094f95 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 19:08:36 -0700 Subject: Increase size of accountSelection dropdown --- ui/app/components/account-dropdowns.js | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index faad31422..f0ebd9f25 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -35,17 +35,23 @@ class AccountDropdowns extends Component { onClick: () => { this.props.actions.showAccountDetail(identity.address) }, + style: { + fontSize: '24px', + } }, [ h( Identicon, { address: identity.address, - diameter: 16, + diameter: 32, + style: { + marginLeft: '10px', + }, }, ), - h('span', { style: { marginLeft: '10px' } }, identity.name || ''), - h('span', { style: { marginLeft: '10px' } }, isSelected ? h('.check', '✓') : null), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, identity.name || ''), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null), ] ) }) @@ -59,10 +65,12 @@ class AccountDropdowns extends Component { Dropdown, { style: { - marginLeft: '-125px', + marginLeft: '-220px', + marginTop: '38px', minWidth: '180px', overflowY: 'auto', maxHeight: '300px', + width: '285px', }, isOpen: accountSelectorActive, onClickOutside: (event) => { @@ -85,10 +93,13 @@ class AccountDropdowns extends Component { h( Identicon, { - diameter: 16, + style: { + marginLeft: '10px' + }, + diameter: 32, }, ), - h('span', { style: { marginLeft: '10px' } }, 'Create Account'), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, 'Create Account'), ], ), h( @@ -101,10 +112,13 @@ class AccountDropdowns extends Component { h( Identicon, { - diameter: 16, + style: { + marginLeft: '10px' + }, + diameter: 32, }, ), - h('span', { style: { marginLeft: '10px' } }, 'Import Account'), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, 'Import Account'), ] ), ] -- cgit From 6f14f4b717c7f1d86611994473ff7c33059218c6 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 19:10:37 -0700 Subject: Allow new accounts selector to handle clicks --- ui/app/components/account-dropdowns.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index f0ebd9f25..b4ae9f606 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -17,7 +17,7 @@ class AccountDropdowns extends Component { accountSelectorActive: false, optionsMenuActive: false, } - this.accountSelectorToggleClassName = 'fa-angle-down' + this.accountSelectorToggleClassName = 'accounts-selector' this.optionsMenuToggleClassName = 'fa-ellipsis-h' } @@ -208,7 +208,7 @@ class AccountDropdowns extends Component { [ enableAccountsSelector && h( // 'i.fa.fa-angle-down', - 'div.cursor-pointer.color-orange', + 'div.cursor-pointer.color-orange.accounts-selector', { style: { // fontSize: '1.8em', -- cgit From baee076348a913529834f7d57239e2ded460aa0a Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 19:17:46 -0700 Subject: Lint ui/app --- ui/app/app.js | 17 +++++++---------- ui/app/components/account-dropdowns.js | 6 +++--- ui/app/components/notice.js | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'ui') diff --git a/ui/app/app.js b/ui/app/app.js index 2566a7515..0592496fc 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -31,7 +31,6 @@ const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete') const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation') const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns -const ethUtil = require('ethereumjs-util') module.exports = connect(mapStateToProps)(App) @@ -44,8 +43,7 @@ function mapStateToProps (state) { accounts, address, } = state.metamask - let selected = address || Object.keys(accounts)[0] - // let checksumAddress = selected && ethUtil.toChecksumAddress(selected) + const selected = address || Object.keys(accounts)[0] return { // state from plugin @@ -252,7 +250,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('mainnet')), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -269,7 +267,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('ropsten')), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -286,7 +284,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('kovan')), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -303,7 +301,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setProviderType('rinkeby')), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -320,7 +318,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => props.dispatch(actions.setDefaultRpcTarget()), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -339,7 +337,7 @@ App.prototype.renderNetworkDropdown = function () { closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), onClick: () => this.props.dispatch(actions.showConfigPage()), style: { - fontSize: '18px' + fontSize: '18px', }, }, [ @@ -625,7 +623,6 @@ App.prototype.renderCommonRpc = function (rpcList, provider) { if ((rpc === 'http://localhost:8545') || (rpc === rpcTarget)) { return null } else { - return h( DropdownMenuItem, { diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index b4ae9f606..fc96ce6c5 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -37,7 +37,7 @@ class AccountDropdowns extends Component { }, style: { fontSize: '24px', - } + }, }, [ h( @@ -94,7 +94,7 @@ class AccountDropdowns extends Component { Identicon, { style: { - marginLeft: '10px' + marginLeft: '10px', }, diameter: 32, }, @@ -113,7 +113,7 @@ class AccountDropdowns extends Component { Identicon, { style: { - marginLeft: '10px' + marginLeft: '10px', }, diameter: 32, }, diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 636e82ba1..c26505193 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -21,7 +21,7 @@ Notice.prototype.render = function () { return ( h('.flex-column.flex-center.flex-grow', { style: { - width: '100%', + width: '100%', }, }, [ h('h3.flex-center.text-transform-uppercase.terms-header', { -- cgit From 5ddb40f60cfd300f97aba82158fa239d1c80f9bc Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 19:23:22 -0700 Subject: Adjust top and bottom padding of accountSwitcher --- ui/app/components/account-dropdowns.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index fc96ce6c5..b61a4996a 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -24,7 +24,7 @@ class AccountDropdowns extends Component { renderAccounts () { const { identities, selected } = this.props - return Object.keys(identities).map((key) => { + return Object.keys(identities).map((key, index) => { const identity = identities[key] const isSelected = identity.address === selected @@ -36,6 +36,7 @@ class AccountDropdowns extends Component { this.props.actions.showAccountDetail(identity.address) }, style: { + marginTop: index === 0 ? '10px' : '', fontSize: '24px', }, }, @@ -118,7 +119,13 @@ class AccountDropdowns extends Component { diameter: 32, }, ), - h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, 'Import Account'), + h('span', { + style: { + marginLeft: '20px', + fontSize: '24px', + marginButtom: '20px', + }, + }, 'Import Account'), ] ), ] -- cgit From 777eb865df2d8dae15eb34589bdd47817aab8486 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 3 Aug 2017 20:02:49 -0700 Subject: Adjust padding of accountSwitcher dropdown --- ui/app/components/account-dropdowns.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ui') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index b61a4996a..da92619e1 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -36,7 +36,7 @@ class AccountDropdowns extends Component { this.props.actions.showAccountDetail(identity.address) }, style: { - marginTop: index === 0 ? '10px' : '', + marginTop: index === 0 ? '5px' : '', fontSize: '24px', }, }, @@ -66,12 +66,15 @@ class AccountDropdowns extends Component { Dropdown, { style: { - marginLeft: '-220px', + marginLeft: '-238px', marginTop: '38px', minWidth: '180px', overflowY: 'auto', maxHeight: '300px', - width: '285px', + width: '300px', + }, + innerStyle: { + padding: '8px 25px', }, isOpen: accountSelectorActive, onClickOutside: (event) => { @@ -123,7 +126,7 @@ class AccountDropdowns extends Component { style: { marginLeft: '20px', fontSize: '24px', - marginButtom: '20px', + marginBottom: '5px', }, }, 'Import Account'), ] -- cgit