Improves response of close button
This commit is contained in:
parent
e3f17df8aa
commit
47ae2f8e59
7 changed files with 36 additions and 18 deletions
|
|
@ -1,9 +1,9 @@
|
||||||
<nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
|
<nav ng-controller="topbarController as topbar" class="tab-bar">
|
||||||
<section class="left-small">
|
<section class="left-small">
|
||||||
<a class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
|
<a class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
|
||||||
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
|
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ng-show="goBackToState"
|
<a ng-show="goBackToState" class="ng-animate-disabled"
|
||||||
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
|
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
|
||||||
<span class="text-back">{{'Back'|translate}}</span>
|
<span class="text-back">{{'Back'|translate}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
<section class="right-small" ng-show="!goBackToState">
|
<section class="right-small" ng-show="!goBackToState">
|
||||||
<a ng-show="!closeToHome && index.isComplete" class="p10"
|
<a ng-show="!closeToHome && index.isComplete" class="p10"
|
||||||
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
|
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
|
||||||
<a ng-show="closeToHome" class="p10"
|
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
|
||||||
ng-click="topbar.goHome(); closeToHome = null">
|
ng-click="topbar.goHome(); closeToHome = null">
|
||||||
<span class="text-close">{{'Close'|translate}}</span>
|
<span class="text-close">{{'Close'|translate}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="last-transactions-content"
|
<div class="last-transactions-content ng-animate-disabled"
|
||||||
ng-class="{'text-gray':!tx.pendingForUs}"
|
ng-class="{'text-gray':!tx.pendingForUs}"
|
||||||
ng-click="openTxModal(tx, index.copayers)">
|
ng-click="openTxModal(tx, index.copayers)">
|
||||||
<div class="m5b size-12 text-gray">
|
<div class="m5b size-12 text-gray">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<nav class="tab-bar">
|
<nav class="tab-bar">
|
||||||
<section class="right-small">
|
<section class="right-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10 ng-animate-disabled">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<nav class="tab-bar">
|
<nav class="tab-bar">
|
||||||
<section class="right-small">
|
<section class="right-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10 ng-animate-disabled">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
|
|
@ -563,11 +563,6 @@ a.pin-button:active {
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal.fade,
|
|
||||||
.reveal-modal.fade {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal.fade .modal-dialog,
|
.modal.fade .modal-dialog,
|
||||||
.modal.in .modal-dialog,
|
.modal.in .modal-dialog,
|
||||||
.reveal-modal-bg,
|
.reveal-modal-bg,
|
||||||
|
|
@ -575,11 +570,29 @@ a.pin-button:active {
|
||||||
.reveal-modal,
|
.reveal-modal,
|
||||||
.reveal-modal .fade,
|
.reveal-modal .fade,
|
||||||
.reveal-modal .fade .out,
|
.reveal-modal .fade .out,
|
||||||
.reveal-modal .fade .in {
|
.reveal-modal .fade .in,
|
||||||
-webkit-transition: none !important;
|
.reveal-modal.fade.full.in,
|
||||||
transition: none !important;
|
.reveal-modal.fade.full.out,
|
||||||
-webkit-transform: none !important;
|
.reveal-modal.fade.full {
|
||||||
transform: none !important;
|
/*CSS transitions*/
|
||||||
|
-o-transition-property: none !important;
|
||||||
|
-moz-transition-property: none !important;
|
||||||
|
-ms-transition-property: none !important;
|
||||||
|
-webkit-transition-property: none !important;
|
||||||
|
transition-property: none !important;
|
||||||
|
/*CSS transforms*/
|
||||||
|
-o-transform: none !important;
|
||||||
|
-moz-transform: none !important;
|
||||||
|
-ms-transform: none !important;
|
||||||
|
-webkit-transform: none !important;
|
||||||
|
transform: none !important;
|
||||||
|
/*CSS animations*/
|
||||||
|
-webkit-animation: none !important;
|
||||||
|
-moz-animation: none !important;
|
||||||
|
-o-animation: none !important;
|
||||||
|
-ms-animation: none !important;
|
||||||
|
animation: none !important;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup-tx-status {
|
.popup-tx-status {
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
$modal.open({
|
$modal.open({
|
||||||
|
animation: false,
|
||||||
templateUrl: 'views/modals/copayers.html',
|
templateUrl: 'views/modals/copayers.html',
|
||||||
windowClass: 'full',
|
windowClass: 'full',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
|
|
@ -259,6 +260,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
};
|
};
|
||||||
|
|
||||||
var modalInstance = $modal.open({
|
var modalInstance = $modal.open({
|
||||||
|
animation: false,
|
||||||
templateUrl: 'views/modals/txp-details.html',
|
templateUrl: 'views/modals/txp-details.html',
|
||||||
windowClass: 'full',
|
windowClass: 'full',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
|
|
@ -769,6 +771,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
};
|
};
|
||||||
|
|
||||||
$modal.open({
|
$modal.open({
|
||||||
|
animation: false,
|
||||||
templateUrl: 'views/modals/tx-details.html',
|
templateUrl: 'views/modals/tx-details.html',
|
||||||
windowClass: 'full',
|
windowClass: 'full',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,11 @@ if (window && window.navigator) {
|
||||||
//Setting up route
|
//Setting up route
|
||||||
angular
|
angular
|
||||||
.module('copayApp')
|
.module('copayApp')
|
||||||
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider) {
|
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider, $animateProvider) {
|
||||||
$urlRouterProvider.otherwise('/');
|
$urlRouterProvider.otherwise('/');
|
||||||
|
|
||||||
|
$animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/);
|
||||||
|
|
||||||
$logProvider.debugEnabled(true);
|
$logProvider.debugEnabled(true);
|
||||||
$provide.decorator('$log', ['$delegate',
|
$provide.decorator('$log', ['$delegate',
|
||||||
function($delegate) {
|
function($delegate) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue