aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-07-07 02:00:32 +0800
committerGitHub <noreply@github.com>2016-07-07 02:00:32 +0800
commitfb5dbd23a9d57850532cf0f8cf0e211b96ea67ca (patch)
tree926c4d56b45e8956f47f0141dbd5be05eded7447
parentdd9957d2b2368812b1f4feee30a4fb7625c5ede8 (diff)
parent04c4dad8902f56d83d40bf61e851cfc0332e4e44 (diff)
downloadtangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar.gz
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar.bz2
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar.lz
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar.xz
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.tar.zst
tangerine-wallet-browser-fb5dbd23a9d57850532cf0f8cf0e211b96ea67ca.zip
Merge pull request #387 from MetaMask/ui-formatting
Ui formatting for account details
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/account-detail.js48
2 files changed, 26 insertions, 23 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e141a920..6bee30518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
# Changelog
## Current Master
+- Fix formatting of account details.
## 2.5.0 2016-06-29
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 20b7bd728..62b9d80ae 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -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,31 +152,31 @@ 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('.flex-row', {
+ style: {
+ justifyContent: 'space-between',
+ alignItems: 'flex-start',
+ },
+ }, [
- h('button', {
- onClick: () => props.dispatch(actions.showSendPage()),
- style: {
- marginBottom: '20px',
- marginRight: '8px',
- },
- }, 'SEND'),
+ h(EtherBalance, {
+ value: account && account.balance,
+ style: {
+ lineHeight: '7px',
+ marginTop: '10px',
+ },
+ }),
- ]),
+ h('button', {
+ onClick: () => props.dispatch(actions.showSendPage()),
+ style: {
+ marginBottom: '20px',
+ marginRight: '8px',
+ },
+ }, 'SEND'),
- ]),
]),
]),