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

Merge branch master into develop-1.0.0

Browse Source
This commit is contained in:
afc163 2016-04-20 19:03:41 +08:00
commit 9d696f97bd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -35,14 +35,14 @@
"dependencies": {
"array-tree-filter": "~1.0.0",
"classnames": "~2.2.0",
"css-animation": "~1.2.0",
"css-animation": "~1.2.3",
"gregorian-calendar": "~4.1.0",
"gregorian-calendar-format": "~4.1.0",
"rc-animate": "~2.0.2",
"rc-calendar": "~5.5.0",
"rc-cascader": "~0.9.0",
"rc-checkbox": "~1.3.0",
"rc-collapse": "~1.5.0",
"rc-collapse": "~1.6.0",
"rc-dialog": "~6.0.1",
"rc-dropdown": "~1.4.3",
"rc-form": "~0.15.0",

1
style/components/collapse.less
View File

@ -57,6 +57,7 @@
color: @text-color;
padding: 0 16px;
background-color: #fff;
transition: height .2s @ease-out;
& > &-box {
padding-top: 16px;

4
style/components/radio.less
View File

@ -123,7 +123,9 @@ span.@{radio-prefix-cls} + * {
> span.@{radio-prefix-cls}-button {
margin-left: 0;
display: none;
display: block;
width: 0;
height: 0;
}
.@{radio-group-prefix-cls}-large & {