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 50 Packages Projects Releases Wiki Activity

Merge branch '1.x-stable'

Browse Source
This commit is contained in:
Benjy Cui 2016-09-27 13:46:44 +08:00
commit 545d4ff384
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -9,6 +9,13 @@ timeline: true
---
## 1.11.2
`2016-09-26`
- 修复 Popover 内嵌 Badge 后失效的问题。[#3109](https://github.com/ant-design/ant-design/issues/3109)
- 修复 Modal 内嵌的 Button 在某些情况下与 Modal 的滚动不同步的问题。[#3031](https://github.com/ant-design/ant-design/issues/3031)
## 1.11.1
`2016-09-14`

2
components/steps/index.zh-CN.md
View File

@ -42,4 +42,4 @@ title: Steps
| status | 指定状态。当不配置该属性时，会使用 Steps 的 `current` 来自动指定状态。可选：`wait` `process` `finish` `error` | String | wait |
| title | 标题 | React.Element | - |
| description | 步骤的详情描述，可选 | React.Element | - |
| icon | 步骤图标，可选 | React.Element | - |
| icon | 步骤图标的类型，可选 | string | - |