Commit Graph

7454 Commits

Author SHA1 Message Date
mushan0x0
dd37457048 feat: Anchor onClick (#11898)
* update: 添加AntAnchor类型

* update: 完成代码逻辑

* update: 添加测试

* update: 点击锚点不记录历史

* update: 添加示例

* docs: 更新文档

* update: 更改onClick事件里的link为对象

* update: 优化代码

* update: 修改propClick为onClick
2018-08-28 20:20:46 +08:00
mushan0x0
62d68b049f feat: Tabs render tab bar (#11856)
* feat: Customized bar of tab.

* docs: 更新关于renderTabBar的中文文档

* docs: 更新关于renderTabBar的英文文档

* update: 优化代码

* docs: 更新关于renderTabBar的文档

* update: 完善renderTabBar代码

* update: 完成自定义tabBar

* docs: 去掉旧的DefaultTabBar参数说明

* update: 修复CI测试

* fix: 去掉>选择器,解决自定义tabBar后样式错误

* update: 优化代码质量

* update: 添加测试

* fix: lint

* fix: 避免tab嵌套bug

* update: 把DefaultTabBar放在renderTabBar里
2018-08-28 18:56:25 +08:00
Sebastian Busch
d47a5be712 Input: new method select(), passed to underlying input (#11906)
* Input: pass through method select() to underlying input

* add test for Input select()
2018-08-28 18:54:21 +08:00
afc163
bf2f7e9c33 Merge branch 'master' into feature-3.9.0 2018-08-28 18:09:01 +08:00
carrie-tanminyi
c2e50610ff Update index.zh-CN.md (#11924) 2018-08-28 17:14:04 +08:00
carrie-tanminyi
7c47ce9824 Update index.zh-CN.md (#11923)
* Update index.zh-CN.md

* Update index.zh-CN.md
2018-08-28 17:13:53 +08:00
y-take
6f443be4d5 Feat(Transfer): Allow to specify item-unit (#11348)
* Add itemUnit, itemsUnit props

* Add document

* Integrate locales

* Keep old locale props still working.
2018-08-28 16:26:32 +08:00
Chandler Moisen
badfac83b0 add @progress-text-color var to <Progress /> (#11771) 2018-08-28 11:36:00 +08:00
HeskeyBaozi
2e85c74898 svg should display block 2018-08-27 20:41:02 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
afc163
1707abb48d Fix switch click error, close #11891 2018-08-27 11:43:54 +08:00
陈帅
266a6ad817 Fix line breaks caused by div (#11888)
* Fix line breaks caused by div

* fix tag test

* use span replace null
2018-08-27 11:20:05 +08:00
zombiej
5e31067c78 add list-style in skeletion 2018-08-26 16:52:32 +08:00
诸岳
474f524df7 Fix conflicts after that master branch is merged into feature-3.9.0 branch 2018-08-26 13:46:29 +08:00
afc163
1a73fde89f Add @card-radius 2018-08-26 12:34:42 +08:00
afc163
5c26ce69c2 revert select demo 2018-08-26 00:28:22 +08:00
afc163
7396948c96 support controlled open for Select, close #10482 2018-08-25 23:41:30 +08:00
afc163
9d61dfff7a Merge branch 'master' into feature-3.9.0 2018-08-25 23:18:03 +08:00
afc163
0f472505db use const 2018-08-25 22:57:24 +08:00
afc163
325bff5324 update modal demo button text 2018-08-25 22:57:24 +08:00
afc163
9fdee487ce Add test case for modal update 2018-08-25 22:57:24 +08:00
afc163
b8b9c02fb9 Add update function for Modal.method, close #11721 2018-08-25 22:57:24 +08:00
nuintun
5f17ed789b Adjust input-number handler style
Make handler look better
2018-08-25 22:51:01 +08:00
afc163
b904f3de6a update demo description 2018-08-25 22:18:25 +08:00
afc163
eed77ea3be Merge branch 'master' into feature-3.9.0 2018-08-25 21:24:43 +08:00
afc163
877f9fd7d6 Add getContainer to Modal.info etc, close #11377 2018-08-25 21:24:18 +08:00
afc163
e4c9d69fc4 Avoid progress text wrap 2018-08-25 21:00:51 +08:00
afc163
be78706364 Merge branch 'master' into feature-3.9.0 2018-08-25 18:55:32 +08:00
HeskeyBaozi
7f22efbfae update test sanpshot 2018-08-25 16:09:10 +08:00
HeskeyBaozi
ec397fef5b update test snapshot 2018-08-25 15:52:14 +08:00
HeskeyBaozi
6fe79dff36 upgrade tree-select 2018-08-25 15:51:07 +08:00
afc163
98c3d8b1d7 tweak wave style 2018-08-25 14:25:21 +08:00
HeskeyBaozi
a62d0272b2 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	package.json
2018-08-25 13:33:32 +08:00
HeskeyBaozi
d9b38aee4b Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	package.json
2018-08-25 13:24:44 +08:00
HeskeyBaozi
984c4f7cb0 use loading 2018-08-25 13:14:43 +08:00
afc163
0ac47fe74f Fix abnormal width of Cascader in IE/Edge, close #11857 2018-08-24 21:07:29 +08:00
afc163
612c5d5c55 Fix Upload.Dragger drag area, close #11869 2018-08-24 20:44:43 +08:00
afc163
1ab61542e4 Fix Input[prefix|suffix] border in Input.Group, close #11863 2018-08-24 20:33:02 +08:00
afc163
1ba99510cd Fix @shadow-1-up, close #11873 2018-08-24 20:26:27 +08:00
afc163
33f5cc4364 Fix long step description overflow, close #11864 2018-08-24 20:25:23 +08:00
HeskeyBaozi
abfd50a7bf use component 2018-08-24 19:47:07 +08:00
HeskeyBaozi
56103c627a update step snapshot 2018-08-24 19:12:55 +08:00
HeskeyBaozi
28e2117c68 use cross 2018-08-24 19:00:06 +08:00
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
HeskeyBaozi
43e6621fb7 use correct icon 2018-08-24 18:11:02 +08:00
HeskeyBaozi
af11401d33 upgrade svg 2018-08-24 17:36:22 +08:00
afc163
bb1ee6dbb4 Merge branch 'master' into feature-3.9.0 2018-08-24 15:12:57 +08:00
afc163
a54d06eb6f fix test case in react 15 2018-08-24 15:12:31 +08:00
HeskeyBaozi
d375070da5 waiting for upgrade rc-tree-select 2018-08-24 14:08:06 +08:00
HeskeyBaozi
9893fec5f1 fix rc-menu test case 2018-08-24 12:28:51 +08:00
afc163
62bacb09bf Fix wave render error in jest, close #11868 2018-08-24 12:11:44 +08:00
HeskeyBaozi
b4e6f756a7 use svg icon in dropdown 2018-08-24 11:51:52 +08:00
HeskeyBaozi
726d32031f upgrade rc-cascader 2018-08-23 22:15:25 +08:00
HeskeyBaozi
d8391d69f3 update steps test 2018-08-23 22:01:51 +08:00
afc163
5448277732 Merge branch 'master' into feature-3.9.0 2018-08-23 21:17:50 +08:00
afc163
e3aa2aaa84 fix submenu cannot hover 2018-08-23 21:14:16 +08:00
zombiej
500ef62638 fix https://github.com/ant-design/ant-design/issues/11423. TreeNode can accept custom prop 2018-08-23 20:38:56 +08:00
Cang Ta
044982ddb7 Remove duplicate theme property 2018-08-23 16:09:37 +08:00
zombieJ
796b56dbc4
New Component Skeleton (#11226)
* Add new component Skeleton
* Add related doc
* Add sample
* Add test case

ref: https://github.com/ant-design/ant-design/issues/10308
2018-08-22 23:34:36 +08:00
Nikolay
7bf50c85e1 Update Form.tsx 2018-08-22 23:28:07 +08:00
Nikolay
563e349946 add strict mode for submit object property names
This feature adds a posibility to validate property names in TypeScript by inserting required object interface.
2018-08-22 23:28:07 +08:00
陈帅
cc2bd76595 add top MultiDrawer 2018-08-22 23:27:52 +08:00
jljsj33
5676a10726 add ease-base-in ease-base-out 2018-08-22 23:27:52 +08:00
jljsj33
4233c55418 fix drawer scroll bar no animation 2018-08-22 23:27:52 +08:00
陈帅
2ca3661e87 placement add top and bottom 2018-08-22 23:27:52 +08:00
陈帅
83790dfee5 fix #11583 #11443 remove pointer-events 2018-08-22 23:27:52 +08:00
afc163
11d29fb522 use break-word over break-all, close #11722 2018-08-22 23:05:46 +08:00
HeskeyBaozi
0c751ca3b5 remove pseudo-class in pagination 2018-08-22 20:01:00 +08:00
苏秦
3ffc7f6ac2 Upload: remove necessary signatures 2018-08-22 20:00:42 +08:00
Bradley Xu
f20a1e4e5d docs: update button demo doc 2018-08-22 16:22:30 +08:00
jiang
110e65d74d
Fix drawer flash (#11833)
* fix drawer flash

* remove drawer transition
2018-08-22 16:06:33 +08:00
wangxueliang
fa89c79d80 fix: word error praentDrawer => parentDrawer 2018-08-22 14:33:42 +08:00
afc163
2e759e2bea Add initial prop for TypeScript, ref #11180 2018-08-22 13:54:51 +08:00
afc163
db736843ff Add Steps[initial], close #11180 2018-08-22 13:53:57 +08:00
afc163
711d78c892 Merge branch 'master' into feature-3.9.0 2018-08-22 13:51:20 +08:00
ohhoney1
a523706625 fix bug: If ItemGroup wraps the first menu, an error is displayed when the menu is collapsed 2018-08-22 11:26:07 +08:00
mmmveggies
09aaafe573 export specific TreeSelect treeData types 2018-08-22 11:21:27 +08:00
afc163
90b401e97b Fix submenu lap between menu, close #11725 2018-08-22 00:49:53 +08:00
afc163
c9901acb7f Fix WeekPicker style, close #11738 2018-08-22 00:41:29 +08:00
HeskeyBaozi
71be9c4a09 use svg icon in collapse 2018-08-21 20:03:48 +08:00
HeskeyBaozi
d369d2bfa5 update icon test snapshot 2018-08-21 18:42:12 +08:00
HeskeyBaozi
c523ae37b8 remove namespace & prefix 2018-08-21 18:41:35 +08:00
HeskeyBaozi
96b38dd3ec use svg icon in introduce 2018-08-21 18:33:52 +08:00
HeskeyBaozi
1b93d795e0 normalize scriptUrl 2018-08-21 18:00:08 +08:00
HeskeyBaozi
ed19561fdd Icon: url => scriptUrl 2018-08-21 17:52:41 +08:00
mofelee
611c127f6b Update index.zh-CN.md 2018-08-21 17:34:13 +08:00
HeskeyBaozi
3b598eafe1 update pagination test snapshot 2018-08-21 17:14:35 +08:00
HeskeyBaozi
b58e74de9f use svg icon in pagination 2018-08-21 17:13:12 +08:00
HeskeyBaozi
ea6656f734 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-21 16:32:30 +08:00
afc163
aba2f5e091 fix test case 2018-08-21 15:59:24 +08:00
afc163
60cff5de40 tweak wave effect detail 2018-08-20 23:55:35 +08:00
afc163
041173f059 tweak animation arguments 2018-08-20 21:02:51 +08:00
afc163
5e37710ecb improve click effect 2018-08-20 20:59:48 +08:00
afc163
e610830a1a Fix blurry checkbox style in windows chrome
https://stackoverflow.com/a/50412034/3040605

close #11797
2018-08-20 19:02:48 +08:00
HeskeyBaozi
88fa58aafa icon English docs 2018-08-20 17:23:28 +08:00
HeskeyBaozi
9330aaec06 update table test snapshot 2018-08-20 15:37:55 +08:00
afc163
40a702cebe fix locale-provide demo 2018-08-20 15:09:44 +08:00
afc163
ab7855d104 demo: update badge demo 2018-08-20 15:07:05 +08:00
afc163
22162fe04b Fix badge zoom animation style 2018-08-20 14:53:58 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
afc163
dfdd5449b0 update LocaleProvider demo 2018-08-20 11:46:56 +08:00
afc163
37b1ed16b3 update LocaleProvider demo 2018-08-20 11:37:55 +08:00
Alexey Yakovlev
3582f46347 Update TreeProps.onCheck callback signature. 2018-08-19 20:16:27 +08:00
Junbin Huang
4622dce879
fix: tags initially hidden, closing #11757 (#11761)
* fix: tags initially hidden, closing #11757

* update snapshots
2018-08-18 14:29:25 +08:00
afc163
838be31543 good looking table demo 2018-08-18 12:48:56 +08:00
陈帅
958e8ebc4b Fix drawer (#11702)
* fix #11583 #11443 remove pointer-events

* update snap  fix ci

* @ease change to @drawer-easing

* add @ease-base-out and @ease-base-in

* fix drawer
2018-08-18 12:34:40 +08:00
afc163
ec6d88f407 Fix modal text being selected when open it with double click, close #11777 2018-08-17 19:13:42 +08:00
HeskeyBaozi
33d270aaf2 tree dynamic icon 2018-08-17 16:36:33 +08:00
HeskeyBaozi
d185068c20 yarn upgrade rc-tree 2018-08-17 16:04:11 +08:00
yoyo837
004d786cb4 补充中文文档 2018-08-16 23:00:52 +08:00
HeskeyBaozi
1603cec802 upgrade icon docs 2018-08-16 18:44:43 +08:00
afc163
9555626898 tweak indeterminate checkbox design 2018-08-16 17:43:00 +08:00
afc163
84119d8959 Fix badge position when it's children is display:block
https://codepen.io/afc163/pen/MBMjqG?editors=0110
2018-08-16 17:10:47 +08:00
HeskeyBaozi
8c4f98572b update tab snapshot 2018-08-16 16:15:25 +08:00
HeskeyBaozi
b5db75f8ea upgrade svg tabs prev & next icon 2018-08-16 16:13:18 +08:00
HeskeyBaozi
7a31fd37ad Icon.create => Icon.createFromIconfontCN 2018-08-16 15:22:38 +08:00
HeskeyBaozi
6557917554 update custom demo 2018-08-16 14:46:31 +08:00
HeskeyBaozi
f275f3090a update Icon api 2018-08-16 11:41:37 +08:00
HeskeyBaozi
7925355ca7 upgrade Icon api 2018-08-15 17:21:02 +08:00
HeskeyBaozi
cd778e7a57 upgrade Icon api 2018-08-15 17:19:13 +08:00
Shuvalov Anton
b126b23b2d fixed article
Just small grammar fix, nothing serious
2018-08-14 23:53:33 +08:00
HeskeyBaozi
c3816d2859 align validating icon with input suffix icon 2018-08-14 18:20:45 +08:00
HeskeyBaozi
48bd38b6af update icon test cases 2018-08-14 17:37:23 +08:00
HeskeyBaozi
3f9d5e949f update icon demo code 2018-08-14 17:17:51 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
b9a9c308c9 [breaking] remove iconfont-font class helper 2018-08-14 15:31:20 +08:00
afc163
89a1dc5125 Fix rate focus outline style, close #11736 2018-08-14 15:03:44 +08:00
HeskeyBaozi
049ce5c307 use time-picker with svg icon 2018-08-14 14:45:04 +08:00
afc163
8d873785a7 Add badge above footer kitchen link 2018-08-14 12:26:53 +08:00
HeskeyBaozi
e57e19f354 fix Input.Search test case in react15 2018-08-14 11:45:30 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
0a8f964935 update test snap shot 2018-08-13 14:46:55 +08:00
Bartek
e107b03cc7 closing #11604, add selectable to AntTreeNodeProps (#11651) 2018-08-13 14:09:32 +08:00
Wei Zhu
be74114d22 fix: Input 'autosize' is missing in type error
close #11697

`autosize` was used for `<Input type="textarea" />` which has been
separated to Input.Textarea
2018-08-13 14:04:27 +08:00
HeskeyBaozi
9f3d58faca update cascader snapshot 2018-08-13 11:45:27 +08:00
HeskeyBaozi
c0e365c488 use cascader expand icon 2018-08-13 11:44:25 +08:00
HeskeyBaozi
3baec95628 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-13 09:26:33 +08:00
afc163
755132cc26 tweak spin container loading style 2018-08-13 00:14:20 +08:00
afc163
838abbd358 tweak table demo 2018-08-12 22:02:33 +08:00
afc163
f1649efebb update rate snapshots 2018-08-12 01:40:14 +08:00
afc163
754a22ca24 Fix radio align problem in safari 2018-08-11 20:57:43 +08:00
afc163
589415ed95 Fix Tag with wave effect 2018-08-11 15:46:45 +08:00
afc163
4d7f1b191f remove console 2018-08-11 15:34:14 +08:00
afc163
7b719ce457 simplicy Anchor test 2018-08-11 15:16:33 +08:00
afc163
9cf6ae6010 Refactor and apply wave click animation to more components
now support Button, Tag, Radio.Button and switch
2018-08-11 15:14:34 +08:00
afc163
d8fd521f92 fix BackTop test fails a lot again 2018-08-11 12:07:14 +08:00
afc163
fbab93fbd6 fix anchor test fails a lot again 2018-08-11 11:23:42 +08:00
afc163
0e2c58e42e Fix card width in List.Grid, close #11712 2018-08-11 00:56:16 +08:00
董天成
6203298f32 Fix typescript compile error (#11709) 2018-08-10 22:03:59 +08:00
张聪
8a9fbcb5e4 Migrate lifecycle method: Upload, CheckboxGroup, Layout.Sider, Tooltip, Popconfirm (#11682)
* Upload lifecycle method migrate

* CheckboxGroup lifecycle method migrate

* Layout.Sider lifecycle method migrate

* Tooltip lifecycle method migrate

* Popconfirm lifecycle method migrate

* test Spin as a controlled component
2018-08-10 17:04:40 +08:00
Vitaliy Mazurenko
a14e476eeb Anchor component with affix=true doesn't work inside inner scrollable… (#11688)
close #11687
2018-08-10 13:37:17 +08:00
afc163
c2319f0998 fix test fails a lot 2018-08-10 00:11:12 +08:00
afc163
f2ce60cb6c fix test case failed often 2018-08-09 21:03:14 +08:00
Havin
2c4c5fc6e3 move getPopupContainer from SelectProps to AbstractSelectProps (#11690) 2018-08-09 20:48:37 +08:00
JamesYin
583abe8dbb compatible with thumbnail which url has no extension (#11684)
* compatible with thumbnail which url has no extension

* restore newline #11684
2018-08-09 20:30:02 +08:00
HeskeyBaozi
bda65ddb1e update select snapshot 2018-08-09 16:07:57 +08:00
HeskeyBaozi
4945d66084 update select 2018-08-09 12:07:27 +08:00
afc163
7f78cc9753 Fix detete x missing in Upload, close #10454 2018-08-08 20:00:26 +08:00
Cong Zhang
52cb4fe9cb TimePicker #9792 peer with react@15 2018-08-08 16:19:23 +08:00
afc163
b4d95f7e20 Refactor button click effect implementation
for better perfermance
2018-08-08 16:18:45 +08:00
afc163
45fb83d64c simplify style code 2018-08-08 16:18:45 +08:00
偏右
070e340958 Revert "TimePicker #9792"
This reverts commit 5b37e09ea1.
2018-08-08 14:03:15 +08:00
afc163
e2534681c4 update snapshot 2018-08-08 11:05:07 +08:00
Cong Zhang
5b37e09ea1 TimePicker #9792 2018-08-08 10:38:39 +08:00
João Paquim
363a29c942 Fix typo, filed => field 2018-08-08 10:37:42 +08:00
Dmitriy Mironov
a270597d63 Fix a typo 2018-08-08 10:36:07 +08:00
afc163
287d08890a renew typescript typings 2018-08-07 23:52:59 +08:00
Wei Zhu
064bfaf554 Add @types/prop-types 2018-08-07 21:09:05 +08:00
tangjinzhou
257f3ec35d fix: badge offset x y axis order error 2018-08-07 20:45:58 +08:00
Zheeeng
c3326a5bff Add missing prop signature destroyInactivePanel 2018-08-07 17:31:35 +08:00
HeskeyBaozi
9657f4f3a5 update Switch test snapshot 2018-08-07 16:36:38 +08:00
HeskeyBaozi
4afd19ef5f use svg loading icon in Switch component 2018-08-07 16:35:56 +08:00
HeskeyBaozi
15bc92dd3c remove useless jsx prop 2018-08-07 16:35:26 +08:00
HeskeyBaozi
f90d32a0ef fix lint 2018-08-06 20:16:32 +08:00
afc163
b6e9646a6a Fix that focusable element in inactive panel cause tabs disappear
close #11261
2018-08-06 18:40:46 +08:00
HeskeyBaozi
bcfbf1f46a update docs & support svg-sprite-loader 2018-08-06 18:10:30 +08:00
HeskeyBaozi
b2ab727c89 resolve conflicts 2018-08-06 15:06:06 +08:00
afc163
80f82674fb Fix TimePicker unexpected long width 2018-08-05 20:15:54 +08:00
afc163
76afe5037d demo: improve drawer demo and test case code 2018-08-05 14:28:39 +08:00
afc163
1b3d063990 test: fix drawer test case 2018-08-05 14:16:08 +08:00
afc163
bead75021b change and undocument onSelectMultiple cause it need more disscuss 2018-08-05 13:58:54 +08:00
afc163
510add6305 Drawer wrapClassName => className 2018-08-05 11:56:40 +08:00
Fernando Giarritiello
5cac2fab4a Added className prop to Drawer 2018-08-05 11:48:51 +08:00
HeskeyBaozi
535f68dbd0 add icon features 2018-08-04 18:42:41 +08:00
afc163
e450ab64fa Merge branch 'feature-3.8.0' 2018-08-04 17:00:17 +08:00
afc163
80a4581a79 Fix progress demo 2018-08-04 16:59:25 +08:00
Benoît Latinier
2b72149a50 Add strokeLinecap attribute to progress component 2018-08-04 16:58:50 +08:00
afc163
afeda4fe70 demo: update presetted-ranges description 2018-08-04 12:04:07 +08:00
Evert Bouw
268a1817b7 remove blank line 2018-08-04 11:33:49 +08:00
Evert Bouw
cc6e1ba9d7 Clean up TextAreaProps type
The props for TextArea included React.TextareaHTMLAttributes twice
2018-08-04 11:33:49 +08:00
Thibault Derousseaux
43abea3212 Use tabular-nums font variant instead of switching to Tahoma for figures
Using a completely different font for figures leads to inconsistencies: https://github.com/ant-design/ant-design/issues/9422.
Most modern font systems defaults to [tabular figures](https://www.fonts.com/content/learning/fontology/level-3/numbers/proportional-vs-tabular-figures).
One exception to this is Apple's San Francisco which defaults to [proportional figures](http://martiancraft.com/blog/2015/10/san-francisco-part-2/#special-features-numerals).
There is, however, an official and clean way to switch to tabular figures. It's the [`font-variant` CSS property](https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-numeric) that can be set to `tabular-nums`.

This commit removes the "Monospaced Number" font altogether and use `font-variant: tabular-nums` instead where it was used.
It also moves closer to the sans-serif and monospace [system font stacks used by GitHub](http://markdotto.com/2018/02/07/github-system-fonts/).
2018-08-04 11:28:14 +08:00
afc163
aa2b1a4352 Merge branch 'master' into feature-3.8.0 2018-08-03 23:16:08 +08:00
Jackie.Ls
9b150d9246 update (#11597) 2018-08-03 17:13:50 +08:00
Bartek
b9c248f313 changing the interface of TreeSelect, updating docs (#11538) 2018-08-03 17:12:51 +08:00
HeskeyBaozi
ccdff565de Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-03 15:54:57 +08:00
NumanHassan
a14ba62a07 Update index.en-US.md (#11587) 2018-08-02 21:00:53 +08:00
Emerson Laurentino
0f9da43522 Avatar custom size (#11419)
* add avatar support custom size

* me added to author list and sorting alphabetically

* fix avatar sizeChildrenStyle preference

* fix authors

* fix snapshots
2018-08-02 20:25:14 +08:00
Wu Haotian
57646f24db fix: correct typing of RcFile. close #10331 2018-08-02 18:05:31 +08:00
HeskeyBaozi
46cb1c8cde resolve conflict. 2018-08-02 18:02:43 +08:00
HeskeyBaozi
cc180e2605 resolve conflict. 2018-08-02 18:02:31 +08:00