aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-04-06 12:43:58 +0800
committerGitHub <noreply@github.com>2017-04-06 12:43:58 +0800
commitb9223032235df9e1fc2785f885819d84f2b51dbe (patch)
tree2daaa79c7adf81c80747d8276231facf8166fe31
parentdd6b4505f41b80a4f4cd3654412349b262c3cd76 (diff)
parentddbbc645d3cb5bb04d0afb7b30696788ab93480c (diff)
downloadtangerine-wallet-browser-b9223032235df9e1fc2785f885819d84f2b51dbe.tar.gz
tangerine-wallet-browser-b9223032235df9e1fc2785f885819d84f2b51dbe.tar.zst
tangerine-wallet-browser-b9223032235df9e1fc2785f885819d84f2b51dbe.zip
Merge pull request #1310 from MetaMask/account-transition-fix
Account transition fix
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/account-detail.js2
-rw-r--r--ui/app/accounts/index.js2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a54cf886..fd754cadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Current Master
- Popup new transactions in Firefox.
+- Fix transition issue from account detail screen.
## 3.5.2 2017-3-28
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 514be7f25..018e74893 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -60,7 +60,7 @@ AccountDetailScreen.prototype.render = function () {
// header - identicon + nav
h('div', {
style: {
- marginTop: '20px',
+ paddingTop: '20px',
display: 'flex',
justifyContent: 'flex-start',
alignItems: 'flex-start',
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index ae69d9297..9584ebad9 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -97,7 +97,7 @@ AccountsScreen.prototype.render = function () {
style: {
display: 'flex',
height: '40px',
- paddint: '10px',
+ padding: '10px',
justifyContent: 'center',
alignItems: 'center',
},