aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-19 07:30:13 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-19 07:30:13 +0800
commit98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1 (patch)
treef9f55707a7fcf20bdcd03d6c9a09c521d52ef2ab /ui
parent3525dc080110e7af1f9544e18b5646c87fb9ae95 (diff)
downloadtangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar.gz
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar.bz2
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar.lz
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar.xz
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.tar.zst
tangerine-wallet-browser-98dab0ffd2a3f30624fecbc6d6a2df5cdcf63bc1.zip
Make ballance teal for shapeshift tx and add to change log
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/eth-balance.js4
-rw-r--r--ui/app/components/shift-list-item.js4
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 6c324c947..bb2dc9010 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -21,10 +21,10 @@ EthBalanceComponent.prototype.render = function () {
return (
- h('.ether-balance', {
+ h('.ether-balance.ether-balance-amount', {
style: style,
}, [
- h('.ether-balance-amount', {
+ h('div', {
style: {
display: 'inline',
width: width,
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index c4cc554fb..6e41a2ec3 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -100,11 +100,12 @@ ShiftListItem.prototype.renderUtilComponents = function () {
alignItems: 'baseline',
},
}, [
- h('.color-orange', {
+ h('div', {
style: {
fontFamily: 'Montserrat Light',
position: 'relative',
left: '6px',
+ color: '#01888C',
},
}, '+'),
h(EtherBalance, {
@@ -113,6 +114,7 @@ ShiftListItem.prototype.renderUtilComponents = function () {
shorten: true,
style: {
fontSize: '15px',
+ color: '#01888C',
},
}),
]),