anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix preferences animation

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-23 18:29:25 -03:00
commit eaa3247479
3 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/views/includes/topbar.html
View file

@ -1,6 +1,6 @@
<nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn"> <nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
<section class="left-small"> <section class="left-small">
<a class="p10" ng-show="!goBackToState && !index.noFocusedWallet" <a class="p10" ng-show="!goBackToState && !closeToState && !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"
@ -10,8 +10,12 @@
</section> </section>
<section class="right-small" ng-show="index.isComplete && !goBackToState"> <section class="right-small" ng-show="index.isComplete && !goBackToState">
<a class="p10" <a ng-show="!closeToState" 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="closeToState" class="p10"
ng-click="$root.go(closeToState); closeToState = null">
{{'Done'|translate}}
</a>
</section> </section>
<section class="middle tab-bar-section"> <section class="middle tab-bar-section">

21
src/css/mobile.css
View file

@ -642,45 +642,44 @@ a.pin-button:active {
.animation-left.ng-enter, .animation-left.ng-leave, .animation-left.ng-enter, .animation-left.ng-leave,
.animation-right.ng-enter, .animation-right.ng-leave { .animation-right.ng-enter, .animation-right.ng-leave {
-webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms; -webkit-transition: all ease-in-out 250ms;
-moz-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms; transition: all ease-in-out 250ms;
-ms-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
-o-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
} }
.animation-left.ng-enter { .animation-left.ng-enter {
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
opacity: 0.6; -webkit-transition-delay: 0.001s;
transition-delay: 0.001s;
} }
.animation-right.ng-enter { .animation-right.ng-enter {
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
opacity: 0.6; -webkit-transition-delay: 0.001s;
transition-delay: 0.001s;
} }
.animation-left.ng-enter.ng-enter-active, .animation-left.ng-enter.ng-enter-active,
.animation-right.ng-enter.ng-enter-active { .animation-right.ng-enter.ng-enter-active {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
opacity: 1;
} }
.animation-left.ng-leave, .animation-left.ng-leave,
.animation-right.ng-leave { .animation-right.ng-leave {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
opacity: 0.6;
} }
.animation-left.ng-leave.animation-left.ng-leave-active { .animation-left.ng-leave.animation-left.ng-leave-active {
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
opacity: 0.6; -webkit-transition-delay: 0.001s;
transition-delay: 0.001s;
} }
.animation-right.ng-leave.animation-right.ng-leave-active { .animation-right.ng-leave.animation-right.ng-leave-active {
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
opacity: 0.6; -webkit-transition-delay: 0.001s;
transition-delay: 0.001s;
} }
.tab-view { .tab-view {

4
src/js/routes.js
View file

@ -192,7 +192,7 @@ angular
templateUrl: 'views/includes/topbar.html', templateUrl: 'views/includes/topbar.html',
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Preferences'; $scope.titleSection = 'Preferences';
$scope.goBackToState = 'walletHome'; $scope.closeToState = 'walletHome';
} }
} }
} }
@ -405,7 +405,7 @@ angular
receive: 0, receive: 0,
send: 0, send: 0,
history: 0, history: 0,
preferences: 11, preferences: 0,
preferencesColor: 12, preferencesColor: 12,
backup: 12, backup: 12,
delete: 12, delete: 12,