From 0731c47e323039b81fa03cfc01ed93308c851681 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 7 May 2015 11:07:33 -0300
Subject: [PATCH] Close button in correct position. Modal animation
 customizable

---
 public/views/modals/copayers.html    | 2 +-
 public/views/modals/paypro.html      | 2 +-
 public/views/modals/scanner.html     | 2 +-
 public/views/modals/tx-details.html  | 2 +-
 public/views/modals/txp-details.html | 2 +-
 src/css/mobile.css                   | 4 ++--
 src/js/controllers/walletHome.js     | 8 ++++----
 src/js/services/txStatus.js          | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/views/modals/copayers.html b/public/views/modals/copayers.html
index fc7a321c9..c1c167e42 100644
--- a/public/views/modals/copayers.html
+++ b/public/views/modals/copayers.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar">
-  <section class="right-small">
+  <section class="left-small">
     <a ng-click="cancel()" class="p10">
       <span class="text-close" translate>Close</span>
     </a>
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index b2a7e5a7e..94b35b622 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar">
-  <section class="right-small">
+  <section class="left-small">
     <a ng-click="cancel()" class="p10">
       <span class="text-close" translate>Close</span>
     </a>
diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html
index 352a588b3..6d12d1cab 100644
--- a/public/views/modals/scanner.html
+++ b/public/views/modals/scanner.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar">
-  <section class="right-small">
+  <section class="left-small">
     <a ng-click="cancel()" class="p10">
       <span class="text-close" translate>Close</span>
     </a>
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index eade63dc4..eb8e25b1c 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar">
-  <section class="right-small">
+  <section class="left-small">
     <a ng-click="cancel()" class="p10 ng-animate-disabled">
       <span class="text-close" translate>Close</span>
     </a>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index a2cd28405..f9d036e46 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar">
-  <section class="right-small">
+  <section class="left-small">
     <a ng-click="cancel()" class="p10">
       <span class="text-close" translate>Close</span>
     </a>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 660f4c4c4..97b568f23 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -590,7 +590,7 @@ a.pin-button:active {
   }
 }
 
-.reveal-modal.ng-animate.in-remove { 
+.reveal-modal.ng-animate.in-remove.closeModalAnimation { 
   -webkit-animation-name: slideOutDown;
   animation-name: slideOutDown;
   z-index: 1003;
@@ -622,7 +622,7 @@ a.pin-button:active {
   }
 }
 
-.reveal-modal.ng-animate.in-add.in.in-add-active {
+.reveal-modal.ng-animate.in-add.in.in-add-active.openModalAnimation {
   -webkit-animation-name: slideInUp;
   animation-name: slideInUp;
 }
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 49f6528c5..bfaa27f9a 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -101,7 +101,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     };
     $modal.open({
       templateUrl: 'views/modals/copayers.html',
-      windowClass: 'full',
+      windowClass: 'full openModalAnimation closeModalAnimation',
       controller: ModalInstanceCtrl,
     });
   };
@@ -277,7 +277,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
     var modalInstance = $modal.open({
       templateUrl: 'views/modals/txp-details.html',
-      windowClass: 'full',
+      windowClass: 'full openModalAnimation closeModalAnimation',
       controller: ModalInstanceCtrl,
     });
 
@@ -675,7 +675,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     };
     $modal.open({
       templateUrl: 'views/modals/paypro.html',
-      windowClass: 'full',
+      windowClass: 'full openModalAnimation closeModalAnimation',
       controller: ModalInstanceCtrl,
     });
   };
@@ -829,7 +829,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
     $modal.open({
       templateUrl: 'views/modals/tx-details.html',
-      windowClass: 'full',
+      windowClass: 'full openModalAnimation closeModalAnimation',
       controller: ModalInstanceCtrl,
     });
   };
diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js
index b062b0c97..697a6ab51 100644
--- a/src/js/services/txStatus.js
+++ b/src/js/services/txStatus.js
@@ -37,7 +37,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
     };
     $modal.open({
       templateUrl: 'views/modals/tx-status.html',
-      windowClass: 'full popup-tx-status',
+      windowClass: 'full popup-tx-status closeModalAnimation',
       controller: ModalInstanceCtrl,
     });
   };