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

fix amount UI over activity UI

Browse source
This commit is contained in:
Javier 2016-05-20 13:21:58 -03:00
commit 6ccc1c1127
5 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/views/includes/topbar.html
View file

@ -1,6 +1,5 @@
<nav ng-controller="topbarController as topbar"
class="tab-bar"
ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
class="tab-bar" ng-class="{'fade-all': !index.isCordova}" ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
<section class="left-small">
<a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.toggleLeftMenu()"><i class="fi-list size-24"></i>

9
public/views/walletHome.html
View file

@ -54,13 +54,14 @@
-->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
<ion-content delegate-handle="balance" on-scroll="freezeScroll()">
<ion-scroll delegate-handle="balance" on-scroll="freezeScroll()" scrollbar-y="false">
<ion-refresher
pulling-icon="ion-ios-refresh"
spinner="none"
on-refresh="index.updateAll({triggerTxUpdate: true})">
</ion-refresher>
<div class="oh pr">
<div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse}">
<div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse, 'fade-all': !index.isCordova}">
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'>
<span class="size-12 db m10b">{{index.updateError|translate}}</span>
@ -105,9 +106,9 @@
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div>
</div> <!-- oh -->
</ion-content>
</ion-scroll>
<ion-content overflow-scroll="false" class="fade" ng-class="{m150t: !shouldCollapse, m50t: shouldCollapse}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
<ion-content overflow-scroll="false" class="behind" ng-class="{t150: !shouldCollapse, t50: shouldCollapse, 'fade-t': !index.isCordova}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
<div class="m50b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning">