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

Much improved action sheets. Fixes #131

Browse Source
This commit is contained in:
Max Lynch
2013-11-12 23:58:18 -06:00
parent a7330cdd41
commit 4cfeebd730
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/ionic.css vendored
View File

@ -2520,12 +2520,12 @@ a.subdued‎ {
height: 100%;
background-color: rgba(0, 0, 0, 0); }
.action-sheet-backdrop.active {
-webkit-animation: fadeInHalf 0.2s;
animation: fadeInHalf 0.2s;
-webkit-animation: fadeInHalf 0.3s;
animation: fadeInHalf 0.3s;
-webkit-animation-fill-mode: forwards; }
.action-sheet-backdrop.active-remove {
-webkit-animation: fadeOutHalf 0.2s;
animation: fadeOutHalf 0.2s;
-webkit-animation: fadeOutHalf 0.3s;
animation: fadeOutHalf 0.3s;
-webkit-animation-fill-mode: forwards; }
@-webkit-keyframes actionSheetUp {
@ -2552,13 +2552,13 @@ a.subdued‎ {
.action-sheet-up.ng-enter, .action-sheet-up .ng-enter {
opacity: 0;
-webkit-transform: translate3d(0, 100%, 0);
-webkit-animation-duration: 200ms;
-webkit-animation-duration: 400ms;
-webkit-animation-fill-mode: both;
-webkit-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); }
.action-sheet-up.ng-enter-active, .action-sheet-up .ng-enter-active {
-webkit-animation-name: actionSheetUp; }
.action-sheet-up.ng-leave, .action-sheet-up .ng-leave {
-webkit-animation-duration: 200ms;
-webkit-animation-duration: 400ms;
-webkit-animation-fill-mode: both;
-webkit-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); }
.action-sheet-up.ng-leave-active, .action-sheet-up .ng-leave {

12
scss/_action-sheet.scss
View File

@ -30,15 +30,15 @@
background-color: rgba(0,0,0,0);
&.active {
-webkit-animation: fadeInHalf 0.2s;
animation: fadeInHalf 0.2s;
-webkit-animation: fadeInHalf 0.3s;
animation: fadeInHalf 0.3s;
-webkit-animation-fill-mode: forwards;
}
&.active-remove {
-webkit-animation: fadeOutHalf 0.2s;
animation: fadeOutHalf 0.2s;
-webkit-animation: fadeOutHalf 0.3s;
animation: fadeOutHalf 0.3s;
-webkit-animation-fill-mode: forwards;
}
@ -77,7 +77,7 @@ $slide-in-up-function: cubic-bezier(.1, .7, .1, 1);
// Start it down low
-webkit-transform: translate3d(0, 100%, 0);
-webkit-animation-duration: 200ms;
-webkit-animation-duration: 400ms;
-webkit-animation-fill-mode: both;
-webkit-animation-timing-function: $slide-in-up-function;
}
@ -87,7 +87,7 @@ $slide-in-up-function: cubic-bezier(.1, .7, .1, 1);
}
&.ng-leave, .ng-leave {
-webkit-animation-duration: 200ms;
-webkit-animation-duration: 400ms;
-webkit-animation-fill-mode: both;
-webkit-animation-timing-function: $slide-in-up-function;
}