fix amount UI over activity UI

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

View file

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

View file

@ -54,13 +54,14 @@
--> -->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false"> <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 <ion-refresher
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
spinner="none"
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}"> <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 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>
@ -105,9 +106,9 @@
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner> <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div> </div>
</div> <!-- oh --> </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="m50b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation"> <div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning"> <div class="text-center text-warning">

View file

@ -16,6 +16,10 @@
display: inherit; display: inherit;
} }
.behind {
z-index: -1;
}
.bct { .bct {
background-color: transparent !important; background-color: transparent !important;
margin-top: -25px; margin-top: -25px;
@ -67,10 +71,6 @@ button, .button {
padding: 0; padding: 0;
} }
.scroll-view {
height: 100% !important;
}
/* Override the default modal size for large devices */ /* Override the default modal size for large devices */
@media (min-width: 680px) { @media (min-width: 680px) {
.modal { .modal {

View file

@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var vanillaScope = ret; var vanillaScope = ret;
$scope.collapseBalanceContent = function(updating) { $scope.collapseBalanceContent = function(updating) {
if (updating) return; if (updating || isCordova) return;
var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top; var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top;
$scope.shouldCollapse = scrollPosition > 50 ? true : false; $scope.shouldCollapse = scrollPosition > 50 ? true : false;
@ -44,10 +44,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
$scope.freezeScroll = function() { $scope.freezeScroll = function() {
var scrollPosition = $ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top;
var openRatio = $ionicSideMenuDelegate.getOpenRatio(); var openRatio = $ionicSideMenuDelegate.getOpenRatio();
if (scrollPosition < -75 || openRatio != 0) if (openRatio != 0)
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(true); $ionicScrollDelegate.$getByHandle('balance').freezeScroll(true);
else else
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(false); $ionicScrollDelegate.$getByHandle('balance').freezeScroll(false);

View file

@ -460,8 +460,12 @@ ul.manage li {
} }
} }
.fade { .fade-t {
transition: margin-top .2s ease; transition: top .2s ease;
}
.fade-all {
transition: .4s all ease;
} }
.dn { .dn {
@ -624,14 +628,6 @@ ul.manage li {
margin-top: 20px; margin-top: 20px;
} }
.m50t {
margin-top: 50px;
}
.m150t {
margin-top: 150px;
}
.m20tp { .m20tp {
margin-top: 20%; margin-top: 20%;
} }
@ -640,6 +636,14 @@ ul.manage li {
margin-top: 30%; margin-top: 30%;
} }
.t50 {
top: 50px;
}
.t150 {
top: 150px;
}
.m15 { .m15 {
margin: 15px; margin: 15px;
} }
@ -1581,7 +1585,6 @@ input.ng-invalid-match {
color: #fff; color: #fff;
height: 150px; height: 150px;
margin-bottom: 25px; margin-bottom: 25px;
transition: .4s all ease;
} }
.amountcollapsed { .amountcollapsed {
@ -1589,7 +1592,6 @@ input.ng-invalid-match {
text-align: center; text-align: center;
color: #fff; color: #fff;
height: 50px; height: 50px;
transition: .4s all ease;
} }
.alternative-amount { .alternative-amount {