BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2700 from cmgustavo/feat/anims-slide-right 

Fix slide animation for txp and tx history
This commit is contained in:
Matias Alejo Garcia 2015-05-12 00:34:07 -03:00
parent 51f47c8387 c55faa44c6
commit 08a61436fb
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/views/modals/tx-details.html
View File

@ -1,7 +1,8 @@
<nav class="tab-bar">
<section class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
<a ng-click="cancel()">
<i class="icon-arrow-left3 icon-back"></i>
<span class="text-back" translate>Back</span>
</a>
</section>
<section class="middle tab-bar-section">

5
public/views/modals/txp-details.html
View File

@ -1,7 +1,8 @@
<nav class="tab-bar">
<section class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
<a ng-click="cancel()">
<i class="icon-arrow-left3 icon-back"></i>
<span class="text-back" translate>Back</span>
</a>
</section>
<section class="middle tab-bar-section">

5
public/views/walletHome.html
View File

@ -412,7 +412,7 @@
<span class="label tu gray radius" ng-show="btx.action == 'moved'" translate>Moved</span>
</div>
<div class="large-5 medium-5 small-5 columns">
<div class="large-4 medium-4 small-4 columns">
<span class="size-16">
<span ng-if="btx.action == 'received'">+</span>
<span ng-if="btx.action == 'sent'">-</span>
@ -429,6 +429,9 @@
</span>
</div>
</div>
<div class="large-1 medium-1 small-1 columns text-right">
<i class="icon-arrow-right3 size-18"></i>
</div>
<div class="size-14 text-gray columns m5t" ng-if="btx.message || btx.addressTo">
{{btx.message || btx.addressTo}}
</div>

8
src/js/controllers/walletHome.js
View File

@ -283,13 +283,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/txp-details.html',
windowClass: 'full animated slideInUp',
windowClass: 'full animated slideInRight',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass('slideOutRight');
});
modalInstance.result.then(function(txp) {
@ -845,13 +845,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/tx-details.html',
windowClass: 'full animated slideInUp',
windowClass: 'full animated slideInRight',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass('slideOutRight');
});
};