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

This commit is contained in:
yiminghe 2015-08-24 14:30:19 +08:00
commit 3a0ff5c552

View File

@ -101,21 +101,21 @@
}
.@{upload-prefix-cls}-margin-top-enter {
animation: marginTopIn .3s @ease-in-out-circ;
animation: uploadMarginTopIn .3s @ease-in-out-circ;
}
.@{upload-prefix-cls}-margin-top-leave {
animation: marginTopOut .3s @ease-in-out-circ;
animation: uploadMarginTopOut .3s @ease-in-out-circ;
}
@keyframes marginTopIn {
@keyframes uploadMarginTopIn {
from {
margin-top: -25px;
opacity: 0;
}
}
@keyframes marginTopOut {
@keyframes uploadMarginTopOut {
to {
margin-top: -25px;
opacity: 0;