From 716dda944b1a255958e4396c8d285cd372187b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=AA?= Date: Fri, 10 Jul 2015 14:27:12 +0800 Subject: [PATCH] update motion ease and timer --- style/core/motion.less | 4 ++-- style/core/motion/fade.less | 4 ++-- style/core/motion/move.less | 4 ++-- style/core/motion/slide.less | 4 ++-- style/core/motion/zoom.less | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/style/core/motion.less b/style/core/motion.less index 4d676b6ab3..0dd042b19e 100644 --- a/style/core/motion.less +++ b/style/core/motion.less @@ -1,5 +1,5 @@ .motion-common() { - animation-duration: .22s; + animation-duration: .35s; animation-fill-mode: both; display: block !important; } @@ -28,4 +28,4 @@ @import "motion/other"; @import "motion/slide"; @import "motion/swing"; -@import "motion/zoom"; +@import "motion/zoom"; \ No newline at end of file diff --git a/style/core/motion/fade.less b/style/core/motion/fade.less index a05ca9460a..85b3f8492c 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-out; 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; } diff --git a/style/core/motion/move.less b/style/core/motion/move.less index 48f04394e7..ae3f2cd8eb 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 25c50e1083..a237dbe47a 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; } } diff --git a/style/core/motion/zoom.less b/style/core/motion/zoom.less index 5964b6fe8b..9c2fd18b3e 100644 --- a/style/core/motion/zoom.less +++ b/style/core/motion/zoom.less @@ -2,10 +2,10 @@ .make-motion(@className, @keyframeName); .@{className}-enter { opacity: 0; - animation-timing-function: cubic-bezier(0.18, 0.89, 0.32, 1.28); + animation-timing-function: @ease-out-circ; } .@{className}-leave { - animation-timing-function: cubic-bezier(0.6, -0.3, 0.74, 0.05); + animation-timing-function: @ease-in-circ; } } -- GitLab