Merge branch '2.x' into dev

2020-11-20 20:46:10 +08:00
parent 0f98c5b25e 50f0023e9b
commit 27706b023b
17 changed files with 1382 additions and 5 deletions
@@ -72,14 +72,14 @@
    &-slide-left-enter-active,
    &-slide-right-enter-active,
    &-slide-bottom-enter-active {
-      transition-timing-function: ease-out;
+      transition-timing-function: @animation-timing-function-enter;
    }

    &-slide-top-leave-active,
    &-slide-left-leave-active,
    &-slide-right-leave-active,
    &-slide-bottom-leave-active {
-      transition-timing-function: ease-in;
+      transition-timing-function: @animation-timing-function-leave;
    }

    &-slide-top-enter-from,