From 68528f1f09fdfd53bf4c8a79d2c331e722d97a31 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 9 Jul 2015 11:04:45 +0800 Subject: [PATCH] fix easing variable --- style/components/dialog/Dialog.less | 48 ----------------------------- style/core/motion/fade.less | 6 ++-- style/core/motion/move.less | 4 +-- style/core/motion/slide.less | 6 ++-- style/core/motion/zoom.less | 4 +-- 5 files changed, 10 insertions(+), 58 deletions(-) diff --git a/style/components/dialog/Dialog.less b/style/components/dialog/Dialog.less index cdff47233..238cf9547 100644 --- a/style/components/dialog/Dialog.less +++ b/style/components/dialog/Dialog.less @@ -109,52 +109,4 @@ &-wrap-hidden > &&-zoom-leave { display: block; } - - &-zoom-enter { - opacity: 0; - .effect(); - animation-timing-function: cubic-bezier(0.18, 0.89, 0.32, 1.28); - animation-play-state: paused; - } - - &-zoom-leave { - .effect(); - animation-timing-function: cubic-bezier(0.6, -0.3, 0.74, 0.05); - animation-play-state: paused; - } - - &-zoom-enter&-zoom-enter-active { - animation-name: rcDialogZoomIn; - animation-play-state: running; - } - - &-zoom-leave&-zoom-leave-active { - animation-name: rcDialogZoomOut; - animation-play-state: running; - } - - @keyframes rcDialogZoomIn { - 0% { - opacity: 0; - transform-origin: 50% 50%; - transform: scale(0, 0); - } - 100% { - opacity: 1; - transform-origin: 50% 50%; - transform: scale(1, 1); - } - } - @keyframes rcDialogZoomOut { - 0% { - opacity: 1; - transform-origin: 50% 50%; - transform: scale(1, 1); - } - 100% { - opacity: 0; - transform-origin: 50% 50%; - transform: scale(0, 0); - } - } } diff --git a/style/core/motion/fade.less b/style/core/motion/fade.less index a05ca9460..22b10a991 100644 --- a/style/core/motion/fade.less +++ b/style/core/motion/fade.less @@ -1,13 +1,13 @@ .fade-enter { opacity: 0; .motion-common(); - animation-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2); + animation-timing-function: @ease-in; animation-play-state: paused; } .fade-leave { .motion-common(); - animation-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2); + animation-timing-function: @ease-in; animation-play-state: paused; } @@ -37,4 +37,4 @@ 100% { opacity: 0; } -} \ No newline at end of file +} diff --git a/style/core/motion/move.less b/style/core/motion/move.less index 48f04394e..ae3f2cd8e 100644 --- a/style/core/motion/move.less +++ b/style/core/motion/move.less @@ -2,10 +2,10 @@ .make-motion(@className, @keyframeName); .@{className}-enter { opacity: 0; - animation-timing-function: cubic-bezier(0.08, 0.82, 0.17, 1); + animation-timing-function: @ease-out-circ; } .@{className}-leave { - animation-timing-function: cubic-bezier(0.6, 0.04, 0.98, 0.34); + animation-timing-function: @ease-in-circ; } } diff --git a/style/core/motion/slide.less b/style/core/motion/slide.less index 25c50e108..b82c4b4c5 100644 --- a/style/core/motion/slide.less +++ b/style/core/motion/slide.less @@ -2,10 +2,10 @@ .make-motion(@className, @keyframeName); .@{className}-enter { opacity: 0; - animation-timing-function: cubic-bezier(0.08, 0.82, 0.17, 1); + animation-timing-function: @ease-out-circ; } .@{className}-leave { - animation-timing-function: cubic-bezier(0.6, 0.04, 0.98, 0.34); + animation-timing-function: @ease-in-circ; } } @@ -116,4 +116,4 @@ transform-origin: 100% 0%; transform: scaleX(0); } -} \ No newline at end of file +} diff --git a/style/core/motion/zoom.less b/style/core/motion/zoom.less index fbacae67e..142df88d5 100644 --- a/style/core/motion/zoom.less +++ b/style/core/motion/zoom.less @@ -3,10 +3,10 @@ .@{className}-enter { opacity: 0; transform: scale(0, 0); - animation-timing-function: cubic-bezier(0.18, 0.89, 0.32, 1.28); + animation-timing-function: @ease-out-back; } .@{className}-leave { - animation-timing-function: cubic-bezier(0.6, -0.3, 0.74, 0.05); + animation-timing-function: @ease-in-back; } }