Merge pull request #387 from MetaMask/ui-formatting

Ui formatting for account details
feature/default_network_editable
Dan Finlay 9 years ago committed by GitHub
commit fb5dbd23a9
  1. 1
      CHANGELOG.md
  2. 48
      ui/app/account-detail.js

@ -1,6 +1,7 @@
# Changelog # Changelog
## Current Master ## Current Master
- Fix formatting of account details.
## 2.5.0 2016-06-29 ## 2.5.0 2016-06-29

@ -56,7 +56,7 @@ AccountDetailScreen.prototype.render = function () {
// header - identicon + nav // header - identicon + nav
h('div', { h('div', {
style: { style: {
marginTop: '15px', marginTop: '20px',
display: 'flex', display: 'flex',
justifyContent: 'flex-start', justifyContent: 'flex-start',
alignItems: 'flex-start', alignItems: 'flex-start',
@ -120,6 +120,8 @@ AccountDetailScreen.prototype.render = function () {
h('.flex-row', { h('.flex-row', {
style: { style: {
justifyContent: 'flex-end', justifyContent: 'flex-end',
position: 'relative',
bottom: '15px',
}, },
}, [ }, [
h(CopyButton, { h(CopyButton, {
@ -150,31 +152,31 @@ AccountDetailScreen.prototype.render = function () {
// account ballence // account ballence
h('.flex-row', { ]),
style: { ]),
justifyContent: 'space-between', h('.flex-row', {
alignItems: 'flex-start', style: {
}, justifyContent: 'space-between',
}, [ alignItems: 'flex-start',
},
h(EtherBalance, { }, [
value: account && account.balance,
style: {
lineHeight: '7px',
},
}),
h('button', { h(EtherBalance, {
onClick: () => props.dispatch(actions.showSendPage()), value: account && account.balance,
style: { style: {
marginBottom: '20px', lineHeight: '7px',
marginRight: '8px', marginTop: '10px',
}, },
}, 'SEND'), }),
]), h('button', {
onClick: () => props.dispatch(actions.showSendPage()),
style: {
marginBottom: '20px',
marginRight: '8px',
},
}, 'SEND'),
]),
]), ]),
]), ]),

Loading…
Cancel
Save