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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/home_views_polish

Browse source 
# Conflicts:
#	public/views/tab-home.html
This commit is contained in:
Jamal Jackson 2016-09-21 13:18:06 -04:00
commit fda7e641a1
60 changed files with 288 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/tab-home.html
View file

@ -29,12 +29,12 @@
<span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
</a>
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
<span ng-include="'views/includes/txp.html'"></span>
</a>
</div>
<div class="list card" ng-if="notifications.length > 0">
<div class="list card" ng-if="notifications[0]">
<a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
Recent Activity
<i class="icon nav-item-arrow-right"></i>
@ -43,7 +43,7 @@
<ion-spinner icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div>
</span>
<a class="item activity" ng-repeat="x in notifications" ng-click="x.action()">
<a class="item activity" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
</div>