mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-24 19:19:57 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ant-design/ant-design

Browse Source
This commit is contained in:
afc163 2015-09-11 14:57:43 +08:00
commit 7d14e69f81
5 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/menu/index.jsx
View File

@ -15,7 +15,7 @@ const AntMenu = React.createClass({
openAnimation = 'slide-up';
break;
case 'vertical':
openAnimation = 'zoom';
openAnimation = 'zoom-big';
break;
case 'inline':
openAnimation = animation;

5
style/components/slider.less
View File

@ -153,8 +153,9 @@
}
&-inner {
padding: 6px 0;
width: 24px;
padding: 6px 2px;
width: 100%;
min-width: 24px;
height: 24px;
font-size: @font-size-base;
line-height: 1;

4
style/core/motion/fade.less
View File

@ -1,13 +1,13 @@
.fade-enter, .fade-appear {
opacity: 0;
.motion-common();
animation-timing-function: @ease-out;
animation-timing-function: linear;
animation-play-state: paused;
}
.fade-leave {
.motion-common();
animation-timing-function: @ease-in;
animation-timing-function: linear;
animation-play-state: paused;
}

16
style/core/motion/slide.less
View File

@ -18,7 +18,7 @@
0% {
opacity: 0;
transform-origin: 0% 0%;
transform: scaleY(0);
transform: scaleY(.8);
}
100% {
opacity: 1;
@ -36,7 +36,7 @@
100% {
opacity: 0;
transform-origin: 0% 0%;
transform: scaleY(0);
transform: scaleY(.8);
}
}
@ -44,7 +44,7 @@
0% {
opacity: 0;
transform-origin: 100% 100%;
transform: scaleY(0);
transform: scaleY(.8);
}
100% {
opacity: 1;
@ -62,7 +62,7 @@
100% {
opacity: 0;
transform-origin: 100% 100%;
transform: scaleY(0);
transform: scaleY(.8);
}
}
@ -70,7 +70,7 @@
0% {
opacity: 0;
transform-origin: 0% 0%;
transform: scaleX(0);
transform: scaleX(.8);
}
100% {
opacity: 1;
@ -88,7 +88,7 @@
100% {
opacity: 0;
transform-origin: 0% 0%;
transform: scaleX(0);
transform: scaleX(.8);
}
}
@ -96,7 +96,7 @@
0% {
opacity: 0;
transform-origin: 100% 0%;
transform: scaleX(0);
transform: scaleX(.8);
}
100% {
opacity: 1;
@ -114,6 +114,6 @@
100% {
opacity: 0;
transform-origin: 100% 0%;
transform: scaleX(0);
transform: scaleX(.8);
}
}

35
style/core/motion/zoom.less
View File

@ -10,6 +10,7 @@
}
.zoom-motion(zoom, zoom);
.zoom-motion(zoom-big, zoomBig);
.zoom-motion(zoom-up, zoomUp);
.zoom-motion(zoom-down, zoomDown);
.zoom-motion(zoom-left, zoomLeft);
@ -18,20 +19,52 @@
@keyframes zoomIn {
0% {
opacity: 0;
filter: blur(20px);
transform: scale(0);
}
50%{
filter: blur(5px);
}
100% {
filter: blur(0);
transform: scale(1);
}
}
@keyframes zoomOut {
0% {
filter: blur(0);
transform: scale(1);
}
50%{
filter: blur(5px);
}
90%{
opacity: 0.03;
}
100% {
opacity: 0;
filter: blur(20px);
transform: scale(0);
}
}
@keyframes zoomBigIn {
0% {
opacity: 0;
transform: scale(.8);
}
100% {
transform: scale(1);
}
}
@keyframes zoomBigOut {
0% {
transform: scale(1);
}
100% {
opacity: 0;
transform: scale(0);
transform: scale(.8);
}
}