From 5aabbfbd0cd971421d529b2378606ec8747ffe50 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 24 Sep 2013 17:00:35 -0500 Subject: [PATCH] Better modal animation --- dist/ionic.css | 6 +++--- scss/ionic/_animations.scss | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/ionic.css b/dist/ionic.css index 0fe6b19d1d..bc76c8bed2 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -2140,11 +2140,11 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; - transition: transform 0.25s, opacity 0.25s; + -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; + transition: transform 0.4s, opacity 0.4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); - -webkit-transition-timing-function: cubic-bezier(0.1, 0.5, 0.1, 1); } + -webkit-transition-timing-function: cubic-bezier(0.1, 0.6, 0.1, 1); } .slide-in-up.enter-active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } diff --git a/scss/ionic/_animations.scss b/scss/ionic/_animations.scss index fdfa15c4a3..9abd86d9b5 100644 --- a/scss/ionic/_animations.scss +++ b/scss/ionic/_animations.scss @@ -1,5 +1,5 @@ -$bezier-function: cubic-bezier(.1, .5, .1, 1); - +$bezier-function: cubic-bezier(.1, .6, .1, 1); + /* .slide-in-up.enter { -webkit-transform: translate3d(0, 100%, 0); @@ -12,8 +12,8 @@ $bezier-function: cubic-bezier(.1, .5, .1, 1); .slide-in-up { &.enter { - -webkit-transition: -webkit-transform .25s, opacity .25s; - transition: transform .25s, opacity .25s; + -webkit-transition: -webkit-transform .4s, opacity .4s; + transition: transform .4s, opacity .4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0);