aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-04-03 13:26:25 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-04-03 13:26:25 +0800
commit89c924101e3ff52849c5a82ced7e058e1fa39dfd (patch)
treeebc5e65345362b9912d893ee70f3d27a4cf4fd3c /ui
parent8d49d519c090d287484008346aba1df6d7ad77e7 (diff)
parent0a5c634081656c9450d4341b96bab6b4134a0b7a (diff)
downloadtangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.gz
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.bz2
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.lz
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.xz
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.zst
tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.zip
Merge branch 'master' into mascara
Diffstat (limited to 'ui')
-rw-r--r--ui/app/css/index.css1
-rw-r--r--ui/app/keychains/hd/create-vault-complete.js11
2 files changed, 8 insertions, 4 deletions
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index de8ae0e92..033502f5a 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -148,7 +148,6 @@ h2.page-subtitle {
}
textarea.twelve-word-phrase {
- margin-top: 20px;
padding: 12px;
width: 300px;
height: 140px;
diff --git a/ui/app/keychains/hd/create-vault-complete.js b/ui/app/keychains/hd/create-vault-complete.js
index 7272ebdbd..5230797ad 100644
--- a/ui/app/keychains/hd/create-vault-complete.js
+++ b/ui/app/keychains/hd/create-vault-complete.js
@@ -45,12 +45,17 @@ CreateVaultCompleteScreen.prototype.render = function () {
'Vault Created',
]),
- h('span.error', { // Error for the right red
+ h('div', {
style: {
- padding: '12px 20px 0px 20px',
+ width: '360px',
+ height: '78px',
+ fontSize: '1em',
+ marginTop: '10px',
textAlign: 'center',
},
- }, 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
+ }, [
+ h('span.error', 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
+ ]),
h('textarea.twelve-word-phrase', {
readOnly: true,