Merge branch '1.x-stable'

This commit is contained in:
afc163 2016-06-27 19:31:38 +08:00
commit 95351bfffa
39 changed files with 59 additions and 57 deletions

View File

@ -1,25 +1,27 @@
请按照下列格式报告问题,务必提供复现步骤,否则恕难解决,感谢您的支持。
<!-- Issue Template For Chinese Users -->
```
## 你做了什么?
<!-- 请按照下列格式报告问题,务必提供复现步骤,否则恕难解决,感谢您的支持。-->
...
## 本地环境
## 你期待的结果是:
...
## 实际上的结果:
...
## 可重现的在线演示
(请修改并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)
## 本地环境信息
<!-- 务必提供 -->
- antd 版本:
- 操作系统及其版本:
- 浏览器及其版本:
```
## 你做了什么?
<!-- 引入 antd 了 Button -->
## 你期待的结果是:
<!-- 像官网一样正常显示 -->
## 实际上的结果:
<!-- 缺少样式 -->
## 可重现的在线演示
<!-- 请修改并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001 -->

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 警告提示
type: Presentation
type: Views
english: Alert
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 徽标数
type: Presentation
type: Views
english: Badge
---

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
cols: 1
title: Calendar
---

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
chinese: 日历
cols: 1
english: Calendar

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
title: Card
cols: 1
---

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
title: Card
subtitle: 卡片
cols: 1

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
title: Carousel
---

View File

@ -1,6 +1,6 @@
---
category: Components
type: Presentation
type: Views
title: Carousel
subtitle: 走马灯
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 级联选择
type: Form Control
type: Form Controls
english: Cascader
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 多选框
type: Form Control
type: Form Controls
english: Checkbox
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 折叠面板
type: Presentation
type: Views
english: Collapse
---

View File

@ -1,6 +1,6 @@
---
category: Components
type: Form Control
type: Form Controls
english: DatePicker
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 日期选择框
type: Form Control
type: Form Controls
english: DatePicker
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 下拉菜单
type: Presentation
type: Views
english: Dropdown
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 表单
type: Form Control
type: Form Controls
cols: 1
english: Form
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 数字输入框
type: Form Control
type: Form Controls
english: InputNumber
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 输入框
type: Form Control
type: Form Controls
english: Input
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 全局提示
type: Presentation
type: Views
noinstant: true
english: Message
---

View File

@ -1,5 +1,5 @@
---
type: Presentation
type: Views
category: Components
chinese: 对话框
english: Modal

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 通知提醒框
type: Presentation
type: Views
noinstant: true
english: Notification
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 气泡确认框
type: Presentation
type: Views
english: Popconfirm
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 气泡卡片
type: Presentation
type: Views
english: Popover
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 进度条
type: Presentation
type: Views
english: Progress
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 单选框
type: Form Control
type: Form Controls
english: Radio
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 评分
type: Form Control
type: Form Controls
english: Rate
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 选择器
type: Form Control
type: Form Controls
english: Select
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 滑动输入条
type: Form Control
type: Form Controls
english: Slider
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 开关
type: Form Control
type: Form Controls
english: Switch
---

View File

@ -2,7 +2,7 @@
category: Components
chinese: 表格
cols: 1
type: Presentation
type: Views
english: Table
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 标签
type: Presentation
type: Views
english: Tag
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 时间选择框
type: Form Control
type: Form Controls
english: TimePicker
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 时间轴
type: Presentation
type: Views
english: Timeline
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 文字提示
type: Presentation
type: Views
english: Tooltip
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 穿梭框
type: Form Control
type: Form Controls
cols: 1
english: Transfer
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 树选择
type: Form Control
type: Form Controls
english: TreeSelect
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 树形控件
type: Presentation
type: Views
english: Tree
---

View File

@ -1,7 +1,7 @@
---
category: Components
chinese: 上传
type: Form Control
type: Form Controls
english: Upload
---

View File

@ -9,8 +9,8 @@ module.exports = {
},
typeOrder: {
Basic: 0,
'Form Control': 1,
Presentation: 2,
'Form Controls': 1,
Views: 2,
Navigation: 3,
Other: 4,
},