diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | ui/app/components/eth-balance.js | 4 | ||||
| -rw-r--r-- | ui/app/components/shift-list-item.js | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b7833e9d1..493612fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Added ShapeShift to the transaction history +- Added PUB.KEY too ShapeShift request for affiliate program - Added feature to reflect current conversion rates of current vault balance. ## 2.8.0 2016-08-15 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', }, }), ]), |