mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-29 13:47:02 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
afc163 2015-10-26 16:37:13 +08:00
commit 37d18de441
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "antd", "name": "antd",
"version": "0.10.0-beta6", "version": "0.10.0-beta7",
"stableVersion": "0.9.1", "stableVersion": "0.9.1",
"title": "Ant Design", "title": "Ant Design",
"description": "一个 UI 设计语言", "description": "一个 UI 设计语言",
@ -42,7 +42,7 @@
"rc-checkbox": "~1.1.1", "rc-checkbox": "~1.1.1",
"rc-collapse": "~1.3.0", "rc-collapse": "~1.3.0",
"rc-dialog": "~5.1.0", "rc-dialog": "~5.1.0",
"rc-dropdown": "~1.3.3", "rc-dropdown": "~1.4.0",
"rc-form-validation": "~2.4.7", "rc-form-validation": "~2.4.7",
"rc-input-number": "~2.1.2", "rc-input-number": "~2.1.2",
"rc-menu": "~4.6.2", "rc-menu": "~4.6.2",

18
style/components/dropdown.less
View File

@ -100,6 +100,24 @@
} }
} }
} }
&.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
&.slide-up-appear.slide-up-appear-active&-placement-bottomLeft {
animation-name: antSlideUpIn;
}
&.slide-up-enter.slide-up-enter-active&-placement-topLeft,
&.slide-up-appear.slide-up-appear-active&-placement-topLeft {
animation-name: antSlideDownIn;
}
&.slide-up-leave.slide-up-leave-active&-placement-bottomLeft {
animation-name: antSlideUpOut;
}
&.slide-up-leave.slide-up-leave-active&-placement-topLeft {
animation-name: antSlideDownOut;
}
} }
.@{dropdown-prefix-cls}-link { .@{dropdown-prefix-cls}-link {