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

cleanup

Browse source
This commit is contained in:
Marty Alcala 2016-11-10 18:12:40 -05:00
commit 3babc0c47d
5 changed files with 37 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/walletDetails.js
View file

@ -53,7 +53,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
force: !!force,
}, function(err, status) {
$scope.updatingStatus = false;
console.log('status', status);
if (err) {
if (err === 'WALLET_NOT_REGISTERED') {
$scope.walletNotRegistered = true;
@ -150,7 +149,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.txHistory = $scope.completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT);
$scope.txHistoryShowMore = $scope.completeTxHistory.length > $scope.txHistory.length;
}
console.log('$scope.completeTxHistory', $scope.completeTxHistory);
};
$scope.getDate = function(txCreated) {
@ -234,7 +232,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')';
$scope.getScrollPosition = function(){
console.log($ionicScrollDelegate.getScrollPosition().top);
var pos = $ionicScrollDelegate.getScrollPosition().top;
var amountHeight = 180 - pos;
if(amountHeight < 80) {
@ -245,24 +242,22 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
contentMargin = 180;
}
var amountScale = amountHeight/180;
var amountScale = (amountHeight/180);
if(amountScale < 0.5) {
amountScale = 0.5;
}
if(amountScale > 1.1) {
amountScale = 1.1;
}
var s = amountScale;
$scope.altAmountOpacity = (amountHeight - 100)/80;
console.log('amountHeight', amountHeight);
$window.requestAnimationFrame(function() {
$scope.amountHeight = amountHeight + 'px';
$scope.contentMargin = contentMargin + 'px';
$scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')';
console.log('$scope.amountScale', $scope.amountScale);
console.log('$scope.altAmountOpacity', $scope.altAmountOpacity);
$scope.$evalAsync(angular.noop);
});
};

5
src/sass/views/walletDetails.scss
View file

@ -17,7 +17,6 @@
font-size: 12.5px;
}
&__tx-title {
//padding-top: 10px;
flex-grow: 1;
color: $dark-gray;
overflow: hidden;
@ -116,7 +115,6 @@
margin-top: 180px;
padding-top: 0;
top: 0;
//top: 40px;
.scroll {
background: rgb(248, 248, 249);
min-height: 300px;
@ -125,7 +123,6 @@
.amount-wrapper {
position: relative;
overflow: visible;
//margin-top: 40px;
.amount-bg {
content: '';
@ -140,7 +137,6 @@
.amount {
width: 100%;
text-align: center;
//padding: 2rem 1rem 1.5rem 1rem;
color: #fff;
height: 180px;
margin-bottom: 10px;
@ -181,7 +177,6 @@
}
.wallet-not-backed-up-warning {
//margin-top: -15px;
margin-bottom: 1rem;
background: #E15061;
text-align: center;