From cb4f694e86944d432c9dd5effc022de87bdfb3b6 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 6 Jul 2015 14:16:21 +0800 Subject: [PATCH] update duration less var --- style/core/iconfont.less | 2 +- style/core/motion.less | 2 +- style/mixins/button.less | 6 +++--- style/themes/default/custom.less | 10 ---------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/style/core/iconfont.less b/style/core/iconfont.less index 078552dbb2..e7c882d7a8 100644 --- a/style/core/iconfont.less +++ b/style/core/iconfont.less @@ -150,7 +150,7 @@ .@{iconfont-css-prefix}-windows:before {content:"\e66c";} .@{iconfont-css-prefix}-loading:before { display: inline-block; - .animation(loadingCircle @duration-1000 infinite linear); + .animation(loadingCircle 1s infinite linear); content:"\e610"; } diff --git a/style/core/motion.less b/style/core/motion.less index 8a220dc742..4d676b6ab3 100644 --- a/style/core/motion.less +++ b/style/core/motion.less @@ -1,5 +1,5 @@ .motion-common() { - animation-duration: .24s; + animation-duration: .22s; animation-fill-mode: both; display: block !important; } diff --git a/style/mixins/button.less b/style/mixins/button.less index 36a635faa8..89d9c455d1 100644 --- a/style/mixins/button.less +++ b/style/mixins/button.less @@ -203,12 +203,12 @@ border-radius: 50% 50%; content: " "; .scale(0, 0); - .transition(all @duration-300 @ease-in-out); + .transition(all .3s @ease-in-out); z-index: 0; background-color: @primary-color; } - &:not([disabled]):hover, + &:not([disabled]):hover, &:not([disabled]):active, &:not([disabled]).active { > .@{iconfont-css-prefix} { @@ -216,7 +216,7 @@ } } - &:not([disabled]):hover:before, + &:not([disabled]):hover:before, &:not([disabled]):active:before, &:not([disabled]).active:before { .opacity(1); diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less index 42a5ee03d8..a98563946e 100644 --- a/style/themes/default/custom.less +++ b/style/themes/default/custom.less @@ -26,16 +26,6 @@ @cursor-disabled : not-allowed; // Animation -@duration-300 : .3s; -@duration-400 : .4s; -@duration-500 : .5s; -@duration-600 : .6s; -@duration-700 : .7s; -@duration-800 : .8s; -@duration-900 : .9s; -@duration-1000 : 1.0s; -@duration-1100 : 1.1s; -@duration-1200 : 1.2s; @ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); @ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); @ease-in-out : cubic-bezier(0.645, 0.045, 0.355, 1); -- GitLab