BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Circles. No location.

This commit is contained in:
Andy Phillipson 2017-06-08 12:59:51 -04:00
parent 4b95bfc7b9
commit b8a13dda26
No known key found for this signature in database
GPG Key ID: D813A67D567D6C88
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sass/views/bitpayCard.scss
View File

@ -95,10 +95,36 @@
}
}
.tx-icon {
width: 36px;
height: 36px;
float: left;
margin-right: 25px;
.houston {
width: 40px;
height: 40px;
border-radius: 40px;
border: 1px solid;
&.no-border {
border: none;
.svg {
width: 40px;
height: 40px;
display: block;
margin: 0 auto;
position: relative;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
}
.svg {
width: 23px;
height: 23px;
display: block;
margin: 0 auto;
position: relative;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
}
}
.tx-content {
display: flex;

8
www/views/includes/cardActivity.html
View File

@ -1,10 +1,16 @@
<div class="item activity" ng-class="{'sent': tx.price.toString().indexOf('-') > -1 && !tx.pending, 'receive': tx.price.toString().indexOf('-') == -1 && !tx.pending, 'pending': tx.pending}">
<img class="tx-icon svg" ng-src="img/mcc-icons/{{tx.icon}}.svg">
<div class="tx-icon">
<div class="houston" ng-class="{'no-border': tx.icon.includes('topup')}">
<img class="svg" ng-src="img/mcc-icons/{{tx.icon}}.svg">
</div>
</div>
<div class="tx-content">
<div class="tx-title">
<div class="ellipsis">
<div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
<!-- Removed to cleanup look and since intl card does not provide location.
<div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</div>
-->
<div ng-show="tx.pending && tx.transactionId" class="size-12 tx-amount--pending">
<div ng-click="bitpayCard.viewOnBlockchain(tx.transactionId)">View Confirmation Status</div>
</div>