From 17184c8d480f13ae315340d0c9096aeb7357352c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 5 May 2015 13:02:40 -0300 Subject: [PATCH] Slide up/down for all modals --- src/css/mobile.css | 68 +++++++++++++++++++++++++++++++- src/js/controllers/walletHome.js | 3 +- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index bf12de64b..57667b8ae 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -359,7 +359,7 @@ ul.off-canvas-list li a:hover { background: none; } -a, button, .button, input, textarea, select, .reveal-modal { +a, button, .button, input, textarea, select { -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; @@ -559,6 +559,72 @@ a.pin-button:active { height: 100%; overflow: auto; padding-bottom: 20px; + -webkit-animation-duration: 0.3s; + animation-duration: 0.3s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; +} + +@-webkit-keyframes slideOutDown { + 0% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + visibility: visible; + } + + 100% { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +@keyframes slideOutDown { + 0% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + visibility: visible; + } + + 100% { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +.reveal-modal.fade { + -webkit-animation-name: slideOutDown; + animation-name: slideOutDown; +} + +@-webkit-keyframes slideInUp { + 0% { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + visibility: visible; + } + + 100% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes slideInUp { + 0% { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + visibility: visible; + } + + 100% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.reveal-modal.fade.in { + -webkit-animation-name: slideInUp; + animation-name: slideInUp; } input[type="color"], diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 56d8b2b3f..3accda417 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -277,9 +277,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; var modalInstance = $modal.open({ - animation: true, templateUrl: 'views/modals/txp-details.html', - windowClass: 'full animated slideInUp', + windowClass: 'full', controller: ModalInstanceCtrl, });