aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-06-29 02:37:11 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-06-29 02:37:11 +0800
commit39a758d7c31fc75a31f5e233f5f6e793cba10c85 (patch)
tree3fb20254775eb2f2cda597a983163f41235ebd0a /ui
parenta69882df720afd47fda4f238a77d97c81aaa0cdf (diff)
parent204cb7f1edea12c8438655ab3d601d415ab77e54 (diff)
downloadtangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar.gz
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar.bz2
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar.lz
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar.xz
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.tar.zst
tangerine-wallet-browser-39a758d7c31fc75a31f5e233f5f6e793cba10c85.zip
Merge changelog.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/transaction-list-item-icon.js2
-rw-r--r--ui/app/components/transaction-list-item.js2
-rw-r--r--ui/app/css/index.css5
3 files changed, 7 insertions, 2 deletions
diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index c640de551..8b118b1d4 100644
--- a/ui/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
@@ -15,7 +15,7 @@ TransactionIcon.prototype.render = function () {
const { transaction, txParams, isMsg } = this.props
if (transaction.status === 'rejected') {
- return h('i.fa.fa-exclamation-triangle.fa-lg.error', {
+ return h('i.fa.fa-exclamation-triangle.fa-lg.warning', {
style: {
width: '24px',
},
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 94fde697e..82176059f 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -57,7 +57,7 @@ TransactionListItem.prototype.render = function () {
// large identicon
h('.identicon-wrapper.flex-column.flex-center.select-none', [
- transaction.status === 'unconfirmed' ? h('.red-dot', ' ')
+ transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
: h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
]),
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 24497a66f..d46c859ad 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -171,6 +171,11 @@ app sections
.error {
color: #E20202;
}
+
+.warning {
+ color: #FFAE00;
+}
+
.lock {
width: 50px;
height: 50px;