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

fix css classes name - add refreshing spinner

Browse source
This commit is contained in:
Javier 2016-05-23 11:15:16 -03:00
commit 119b3c7642
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
public/views/walletHome.html
View file

@ -57,11 +57,11 @@
<ion-scroll delegate-handle="balance" on-scroll="freezeScroll()" scrollbar-y="false"> <ion-scroll delegate-handle="balance" on-scroll="freezeScroll()" scrollbar-y="false">
<ion-refresher <ion-refresher
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
spinner="none" spinner="ios-small"
on-refresh="index.updateAll({triggerTxUpdate: true})"> on-refresh="index.updateAll({triggerTxUpdate: true})">
</ion-refresher> </ion-refresher>
<div class="oh pr"> <div class="oh pr">
<div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse, 'fade-all': !index.isCordova}"> <div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, 'amount-collapsed': shouldCollapse, 'fade-all': !index.isCordova}">
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized"> <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'> <div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'>
<span class="size-12 db m10b">{{index.updateError|translate}}</span> <span class="size-12 db m10b">{{index.updateError|translate}}</span>
@ -74,13 +74,10 @@
</div> </div>
<div ng-click='index.updateAll({triggerTxUpdate: true})' ng-show="!index.updateError && index.walletScanStatus != 'error' && !index.shouldHideBalance" on-hold="index.onHold()"> <div ng-click='index.updateAll({triggerTxUpdate: true})' ng-show="!index.updateError && index.walletScanStatus != 'error' && !index.shouldHideBalance" on-hold="index.onHold()">
<strong class="size-36" ng-if="!shouldCollapse">{{index.totalBalanceStr}}</strong> <strong ng-class="{'size-36': !shouldCollapse, 'size-24': shouldCollapse}">{{index.totalBalanceStr}}</strong>
<strong class="size-24" ng-if="shouldCollapse">{{index.totalBalanceStr}}</strong>
<div class="size-14" ng-if="index.totalBalanceAlternative && !shouldCollapse">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div> <div class="size-14" ng-if="index.totalBalanceAlternative && !shouldCollapse">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div>
<div class="size-14" <div class="size-14" ng-if="index.pendingAmount">
ng-if="index.pendingAmount"> <span translate>Pending Confirmation</span>:{{index.pendingAmountStr}}
<span translate>Pending Confirmation</span>:
{{index.pendingAmountStr}}
</div> </div>
</div> </div>
@ -99,7 +96,7 @@
</div> </div>
</div> <!-- amount --> </div> <!-- amount -->
<div ng-class="{walletinfo: !shouldCollapse, walletinfocollapsed: shouldCollapse}"> <div ng-class="{'wallet-info': !shouldCollapse, 'wallet-info-collapsed': shouldCollapse}">
<span ng-include="'views/includes/walletInfo.html'"></span> <span ng-include="'views/includes/walletInfo.html'"></span>
</div> </div>
<div class="camera-icon" ng-show="index.isComplete" ng-if="!shouldCollapse"> <div class="camera-icon" ng-show="index.isComplete" ng-if="!shouldCollapse">

6
src/sass/main.scss
View file

@ -1587,7 +1587,7 @@ input.ng-invalid-match {
margin-bottom: 25px; margin-bottom: 25px;
} }
.amountcollapsed { .amount-collapsed {
width: 100%; width: 100%;
text-align: center; text-align: center;
color: #fff; color: #fff;
@ -1626,7 +1626,7 @@ input.ng-invalid-match {
text-align: center; text-align: center;
border-radius: 5px; border-radius: 5px;
} }
.walletinfo { .wallet-info {
position: absolute; position: absolute;
top: inherit; top: inherit;
left: 10px; left: 10px;
@ -1634,7 +1634,7 @@ input.ng-invalid-match {
font-size: 20px; font-size: 20px;
color: #fff; color: #fff;
} }
.walletinfocollapsed { .wallet-info-collapsed {
position: absolute; position: absolute;
top: inherit; top: inherit;
left: 10px; left: 10px;