diff --git a/examples/routers/notice.vue b/examples/routers/notice.vue index 43cc2a4e..f154d914 100644 --- a/examples/routers/notice.vue +++ b/examples/routers/notice.vue @@ -1,39 +1,43 @@ diff --git a/src/styles/animation/fade.less b/src/styles/animation/fade.less index ca83171d..42391aa9 100644 --- a/src/styles/animation/fade.less +++ b/src/styles/animation/fade.less @@ -1,5 +1,5 @@ .fade-motion(@className, @keyframeName) { - .make-motion(@className, @keyframeName); + .make-motion(@className, @keyframeName, @animation-time-quick); .@{className}-enter-active, .@{className}-appear { opacity: 0; animation-timing-function: linear; @@ -27,4 +27,4 @@ 100% { opacity: 0; } -} \ No newline at end of file +} diff --git a/src/styles/animation/index.less b/src/styles/animation/index.less index 116f9b69..016b7a1f 100644 --- a/src/styles/animation/index.less +++ b/src/styles/animation/index.less @@ -1,15 +1,15 @@ -.motion-common() { - animation-duration: @animation-time; +.motion-common(@time) { + animation-duration: @time; animation-fill-mode: both; } -.make-motion(@className, @keyframeName) { +.make-motion(@className, @keyframeName, @time: @animation-time) { .@{className}-enter-active, .@{className}-appear { - .motion-common(); + .motion-common(@time); animation-play-state: paused; } .@{className}-leave-active { - .motion-common(); + .motion-common(@time); animation-play-state: paused; } .@{className}-enter-active, .@{className}-appear { @@ -29,4 +29,4 @@ .collapse-transition { transition: @transition-time height ease-in-out, @transition-time padding-top ease-in-out, @transition-time padding-bottom ease-in-out; -} \ No newline at end of file +} diff --git a/src/styles/custom.less b/src/styles/custom.less index 904eba7e..b7ba7d3c 100644 --- a/src/styles/custom.less +++ b/src/styles/custom.less @@ -198,6 +198,7 @@ // Animation @animation-time : .3s; +@animation-time-quick : .15s; @transition-time : .2s; @ease-in-out : ease-in-out;