Merge pull request #387 from MetaMask/ui-formatting

Ui formatting for account details
This commit is contained in:
Dan Finlay 2016-07-06 11:00:32 -07:00 committed by GitHub
commit fb5dbd23a9
2 changed files with 28 additions and 25 deletions

View File

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

View File

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