anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

use contact icon - fix text size - refactor recipient icon type

Browse source
This commit is contained in:
JDonadio 2017-02-20 13:06:42 -05:00
commit 428a842459
9 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
www/views/amount.html
View file

@ -18,15 +18,20 @@
<div class="item item-no-bottom-border recipient-label" translate>Recipient</div>
<div class="item item-text-wrap item-icon-left bitcoin-address">
<i class="icon big-icon-svg" ng-if="isWallet">
<i class="icon big-icon-svg" ng-if="recipientType == 'wallet'">
<img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
</i>
<span ng-if="!isWallet">
<span ng-if="recipientType == 'contact'">
<i class="icon big-icon-svg" ng-if="isChromeApp">
<img src="img/contact-placeholder.svg" class="bg"/>
</i>
<gravatar ng-if="!isChromeApp" class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
</span>
<span ng-if="!recipientType">
<i class="icon big-icon-svg">
<img src="img/contact-placeholder.svg" class="bg"/>
</i>
</span>
<span class="m10l">{{toName || toAddress}}</span>
</div>
</div>

16
www/views/confirm.html
View file

@ -29,12 +29,8 @@
<div class="item">
<span class="label" translate>To</span>
<span class="payment-proposal-to" ng-if="!isWallet">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<i ng-if="isGiftCard" class="icon big-icon-svg">
<div class="bg icon-amazon"></div>
</i>
<img ng-if="isGlidera" src="img/glidera-logo.png" width="90"/>
<span class="payment-proposal-to" ng-if="!recipientType">
<img src="img/icon-bitcoin-small.svg">
<div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
<contact ng-if="!toName" address="{{toAddress}}"></contact>
@ -50,18 +46,18 @@
<!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
</span>
<div class="wallet" ng-if="isWallet">
<div class="wallet" ng-if="recipientType == 'wallet'">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
</i>
<div copy-to-clipboard="toAddress" class="ellipsis">
<contact ng-if="!toName" address="{{toAddress}}"></contact>
<span class="size-14" ng-if="toName">{{toName}}</span>
<span ng-if="toName" class="wallet-name">{{toName}}</span>
</div>
</div>
<div ng-if="toEmail && !isChromeApp" class="gravatar-contact">
<div ng-if="recipientType == 'contact' && !isChromeApp" class="gravatar-contact">
<gravatar class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
<span class="size-14" ng-if="toName">{{toName}}</span>
<span ng-if="toName">{{toName}}</span>
</div>
</div>
<a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">

8
www/views/tab-send.html
View file

@ -42,7 +42,7 @@
<span translate>Add a Contact</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && item.recipientType != 'wallet'" ng-click="goToAmount(item)">
<i class="icon big-icon-svg">
<img src="img/contact-placeholder.svg" class="bg"/ ng-if="isChromeApp">
<gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}" ng-if="!isChromeApp"></gravatar>
@ -61,9 +61,9 @@
<div class="item item-heading">
<span translate>Transfer to Wallet</span>
</div>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.isWallet" ng-click="goToAmount(item)">
<!-- <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
<i class="icon big-icon-svg" ng-if="item.isWallet">
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.recipientType == 'wallet'" ng-click="goToAmount(item)">
<!-- <i ng-show="item.recipientType == 'wallet'" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
<i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'">
<img src="img/icon-wallet.svg" ng-style="{'background-color': item.color}" class="bg"/>
</i>
{{item.name}}