Fix slide up/down for txp and tx

This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-06 11:16:19 -03:00
commit 43a747b96d
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 11 additions and 7 deletions

View file

@ -1,6 +1,6 @@
<div class="ng-animate-disabled row collapse last-transactions-content line-b" <div class="ng-animate-disabled row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}" ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="openTxModal(tx, index.copayers)"> ng-click="home.openTxpModal(tx, index.copayers)">
<div class="small-1 columns text-center" > <div class="small-1 columns text-center" >
<i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i> <i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
&nbsp; &nbsp;

View file

@ -552,12 +552,11 @@ a.pin-button:active {
} }
.reveal-modal { .reveal-modal {
opacity: 0;
padding: 0; padding: 0;
border: none; border: none;
border-radius: 0; border-radius: 0;
top: 0; overflow-y: auto;
height: 100%;
overflow: auto;
padding-bottom: 20px; padding-bottom: 20px;
-webkit-animation-duration: 0.3s; -webkit-animation-duration: 0.3s;
animation-duration: 0.3s; animation-duration: 0.3s;
@ -591,9 +590,10 @@ a.pin-button:active {
} }
} }
.reveal-modal.fade { .reveal-modal.ng-animate.in-remove {
-webkit-animation-name: slideOutDown; -webkit-animation-name: slideOutDown;
animation-name: slideOutDown; animation-name: slideOutDown;
opacity: 1;
} }
@-webkit-keyframes slideInUp { @-webkit-keyframes slideInUp {
@ -622,11 +622,15 @@ a.pin-button:active {
} }
} }
.reveal-modal.fade.in { .reveal-modal.ng-animate.in-add.in.in-add-active {
-webkit-animation-name: slideInUp; -webkit-animation-name: slideInUp;
animation-name: slideInUp; animation-name: slideInUp;
} }
.reveal-modal.fade.in {
opacity: 1;
}
input[type="color"], input[type="color"],
input[type="date"], input[type="date"],
input[type="datetime-local"], input[type="datetime-local"],

View file

@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
}; };
$scope.openTxModal = function(tx, copayers) { this.openTxpModal = function(tx, copayers) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.error = null; $scope.error = null;