aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-11-11 14:31:23 +0800
committerGitHub <noreply@github.com>2016-11-11 14:31:23 +0800
commit115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5 (patch)
tree10e97f3903e4893f2749a8a043d4bbbbfee34e2e
parentf88079c6b9c0e7bf5d7765f8ea8471b64624d8d0 (diff)
parentb60f51dfc2d63bbb0cc8f255699e99ef5e1f0508 (diff)
downloadtangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar.gz
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar.bz2
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar.lz
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar.xz
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.tar.zst
tangerine-wallet-browser-115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5.zip
Merge pull request #807 from MetaMask/cssIsAwesome
Fix funny looking errors in conf-tx
-rw-r--r--ui/app/components/pending-tx.js2
-rw-r--r--ui/app/conf-tx.js6
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)
}
}