javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed modal animations

Browse Source
This commit is contained in:
Max Lynch
2013-09-24 15:49:55 -05:00
parent e81be11d35
commit 26e259be8e
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dist/ionic.css vendored
View File

@ -2139,21 +2139,18 @@ a.button {
transition: transform .25s ease-in-out, opacity 1ms .25s; transition: transform .25s ease-in-out, opacity 1ms .25s;
} }
*/ */
.slide-in-up { .slide-in-up.enter {
-webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
transition: transform 0.25s, opacity 0.25s;
-webkit-transform: translate3d(0, 100%, 0); -webkit-transform: translate3d(0, 100%, 0);
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.5, 0.1, 1); }
.slide-in-up.enter { .slide-in-up.enter-active {
-webkit-transition: -webkit-transform 0.25s, opacity 1ms 0.25s;
transition: transform 0.25s, opacity 1ms 0.25s; }
.slide-in-up.enter-active {
-webkit-transition: -webkit-transform 0.25s;
transition: transform 0.25s;
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); } transform: translate3d(0, 0, 0); }
.slide-in-up.leave { .slide-in-up.leave {
-webkit-transition: -webkit-transform 0.25s, opacity 1ms 0.25s; -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
transition: transform 0.25s, opacity 1ms 0.25s; } transition: transform 0.25s, opacity 0.25s; }
.slide-in-up.leave-active { .slide-in-up.leave-active {
-webkit-transform: translate3d(0, 100%, 0); -webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0); } transform: translate3d(0, 100%, 0); }

15
scss/ionic/_animations.scss
View File

@ -11,28 +11,25 @@ $bezier-function: cubic-bezier(.1, .5, .1, 1);
*/ */
.slide-in-up { .slide-in-up {
&.enter {
-webkit-transition: -webkit-transform .25s, opacity .25s;
transition: transform .25s, opacity .25s;
-webkit-transform: translate3d(0, 100%, 0); -webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0);
-webkit-transition-timing-function: $bezier-function; -webkit-transition-timing-function: $bezier-function;
&.enter {
-webkit-transition: -webkit-transform .25s, opacity 1ms .25s;
transition: transform .25s, opacity 1ms .25s;
} }
&.enter-active { &.enter-active {
-webkit-transition: -webkit-transform .25s;
transition: transform .25s;
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
&.leave { &.leave {
-webkit-transition: -webkit-transform .25s, opacity 1ms .25s; -webkit-transition: -webkit-transform .25s, opacity .25s;
transition: transform .25s, opacity 1ms .25s; transition: transform .25s, opacity .25s;
} }
&.leave-active { &.leave-active {