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 # Changelog
## Current Master ## Current Master
- Fix formatting of account details.
## 2.5.0 2016-06-29 ## 2.5.0 2016-06-29

View File

@ -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,6 +152,8 @@ AccountDetailScreen.prototype.render = function () {
// account ballence // account ballence
]),
]),
h('.flex-row', { h('.flex-row', {
style: { style: {
justifyContent: 'space-between', justifyContent: 'space-between',
@ -161,6 +165,7 @@ AccountDetailScreen.prototype.render = function () {
value: account && account.balance, value: account && account.balance,
style: { style: {
lineHeight: '7px', lineHeight: '7px',
marginTop: '10px',
}, },
}), }),
@ -173,9 +178,6 @@ AccountDetailScreen.prototype.render = function () {
}, 'SEND'), }, 'SEND'),
]), ]),
]),
]),
]), ]),
// subview (tx history, pk export confirm) // subview (tx history, pk export confirm)