diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-11-11 16:18:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 16:18:33 +0800 |
| commit | c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35 (patch) | |
| tree | c4b267d2fbacef335942c7bc83251c6f896d99a6 /ui | |
| parent | e123e3095b97fbec9ffa9ba966b0c24bd8c97723 (diff) | |
| parent | 115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5 (diff) | |
| download | tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar.gz tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar.bz2 tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar.lz tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar.xz tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.tar.zst tangerine-wallet-browser-c664b8f11e32eaa7f8f1b46d4be938f2ebb74d35.zip | |
Merge branch 'master' into i328-MultiVault
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/components/pending-tx.js | 2 | ||||
| -rw-r--r-- | ui/app/conf-tx.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index b619020d1..96f968929 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -31,7 +31,7 @@ PendingTx.prototype.render = function () { `), txData.simulationFails ? - h('span.error', { + h('.error', { style: { marginLeft: 50, fontSize: '0.9em', diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index f4ca52860..8d23adfe5 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -170,6 +170,10 @@ function warningIfExists (warning) { if (warning && // Do not display user rejections on this screen: warning.indexOf('User denied transaction signature') === -1) { - return h('span.error', { style: { margin: 'auto' } }, warning) + return h('.error', { + style: { + margin: 'auto', + }, + }, warning) } } |