From 9cff5d030ce4b25abd0cfe1c68425b82761063d4 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 11 Mar 2014 08:23:03 -0500 Subject: [PATCH] fix(modal): Do not apply the same modal animation to all of its children, closes #683 --- scss/_animations.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scss/_animations.scss b/scss/_animations.scss index 9faea62f5a..4a86fcc624 100644 --- a/scss/_animations.scss +++ b/scss/_animations.scss @@ -436,8 +436,6 @@ $ios7-transition-duration: 250ms; } } -.slide-out-right { -} .slide-out-right-add { @include translate3d(0,0,0); @include animation-duration($transition-duration); @@ -458,16 +456,16 @@ $ios7-transition-duration: 250ms; @include translate3d(0, 100%, 0); } .slide-in-up.ng-enter, -.slide-in-up .ng-enter { +.slide-in-up > .ng-enter { @include transition(all $slide-in-up-function 400ms); } .slide-in-up.ng-enter-active, -.slide-in-up .ng-enter-active { +.slide-in-up > .ng-enter-active { @include translate3d(0, 0, 0); } .slide-in-up.ng-leave, -.slide-in-up .ng-leave { +.slide-in-up > .ng-leave { @include transition(all ease-in-out 250ms); }