From 4cfeebd730641a4a55fb2aebfa14546a343d89e3 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 12 Nov 2013 23:58:18 -0600 Subject: [PATCH] Much improved action sheets. Fixes #131 --- dist/css/ionic.css | 12 ++++++------ scss/_action-sheet.scss | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 1b2062241f..39d67eb890 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -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 { diff --git a/scss/_action-sheet.scss b/scss/_action-sheet.scss index 20899d558a..22060c7076 100644 --- a/scss/_action-sheet.scss +++ b/scss/_action-sheet.scss @@ -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; }