diff --git a/components/checkbox/checkbox.vue b/components/checkbox/Checkbox.vue similarity index 100% rename from components/checkbox/checkbox.vue rename to components/checkbox/Checkbox.vue diff --git a/components/style/mixins/motion.less b/components/style/mixins/motion.less index 84b2c82eb..411143c7f 100644 --- a/components/style/mixins/motion.less +++ b/components/style/mixins/motion.less @@ -20,11 +20,22 @@ .motion-common-leave(@duration); animation-play-state: paused; } + .@{className}-enter-active, + .@{className}-appear-active { + animation-name: ~"@{keyframeName}In"; + animation-play-state: running; + .motion-common(@duration); + } .@{className}-enter.@{className}-enter-active, .@{className}-appear.@{className}-appear-active { animation-name: ~"@{keyframeName}In"; animation-play-state: running; } + .@{className}-leave-active { + animation-name: ~"@{keyframeName}Out"; + animation-play-state: running; + .motion-common(@duration); + } .@{className}-leave.@{className}-leave-active { animation-name: ~"@{keyframeName}Out"; animation-play-state: running; diff --git a/components/tooltip/style/index.less b/components/tooltip/style/index.less index a5377f0d3..dae1ed5bb 100644 --- a/components/tooltip/style/index.less +++ b/components/tooltip/style/index.less @@ -145,63 +145,3 @@ right: 16px; } } - - -/** -modified part ,remove these if needed - */ - -.vc-fade-enter-active, .vc-fade-leave-active { - transition: all 3s; -} -.vc-fade-enter, .vc-fade-leave-to /* .fade-leave-active in below version 2.1.8 */ { - opacity: 0; -} - -.box { - background: red; - width: 100px; - height: 100px; -} -.fade-enter { - opacity: 0; - animation-duration: 0.3s; - animation-fill-mode: both; - animation-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2); - animation-play-state: paused; -} - -.fade-leave { - animation-duration: 0.3s; - animation-fill-mode: both; - animation-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2); - animation-play-state: paused; -} - -.fade-enter.fade-enter-active { - animation-name: rcDialogFadeIn; - animation-play-state: running; -} - -.fade-leave.fade-leave-active { - animation-name: rcDialogFadeOut; - animation-play-state: running; -} - -@keyframes rcDialogFadeIn { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } -} - -@keyframes rcDialogFadeOut { - 0% { - opacity: 1; - } - 100% { - opacity: 0; - } -} diff --git a/components/tooltip/tooltip.vue b/components/tooltip/tooltip.vue index 2ca384638..33912bae6 100644 --- a/components/tooltip/tooltip.vue +++ b/components/tooltip/tooltip.vue @@ -1,13 +1,9 @@ diff --git a/examples/tooltip.vue b/examples/tooltip.vue index 7b18f08b0..651957dbd 100644 --- a/examples/tooltip.vue +++ b/examples/tooltip.vue @@ -1,9 +1,11 @@ - - diff --git a/utils/ant-transition.vue b/utils/ant-transition.vue deleted file mode 100644 index e87ff117c..000000000 --- a/utils/ant-transition.vue +++ /dev/null @@ -1,32 +0,0 @@ - - -