From e7e9eadd516fbb934f85d28c9dfa329ffef3e9b6 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 28 Sep 2015 14:38:45 -0500 Subject: [PATCH] fix(md): update transitions --- ionic/transitions/md-transition.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ionic/transitions/md-transition.ts b/ionic/transitions/md-transition.ts index 48453010aa..a92bf84ad9 100644 --- a/ionic/transitions/md-transition.ts +++ b/ionic/transitions/md-transition.ts @@ -1,9 +1,6 @@ import {Transition} from './transition'; import {Animation} from '../animations/animation'; - -const EASING = 'cubic-bezier(0.36,0.66,0.04,1)'; - const TRANSLATEY = 'translateY'; const OFF_BOTTOM = '40px'; const CENTER = '0px' @@ -14,10 +11,6 @@ class MaterialTransition extends Transition { constructor(nav, opts) { super(nav, opts); - // global duration and easing for all child animations - - this.easing(EASING); - // entering item moves in bottom to center this.enteringView .to(TRANSLATEY, CENTER) @@ -37,7 +30,7 @@ class MaterialTransition extends Transition { // set properties depending on direction if (opts.direction === 'back') { - this.duration(500); + this.duration(200).easing('cubic-bezier(0.47,0,0.745,0.715)'); // back direction this.enteringView @@ -57,7 +50,7 @@ class MaterialTransition extends Transition { } else { // forward direction - this.duration(280); + this.duration(280).easing('cubic-bezier(0.36,0.66,0.04,1)'); this.enteringView .from(TRANSLATEY, OFF_BOTTOM)