Commit Graph

193 Commits

Author SHA1 Message Date
afc163
c65d6f6f36 Merge branch 'master' into feature 2018-09-17 15:01:53 +08:00
诸岳
8f06375589 Fix the vertical alignment for the title of Card (#11036)
* fix: The title of Card should be vertically aligned, close #10576

* Update index.less
2018-09-16 17:44:41 +08:00
afc163
cd9b8b20b5 Merge branch 'master' into feature 2018-09-16 17:29:04 +08:00
picodoth
589bafd5db fix: drop className for tabBar, fix #12051 2018-09-15 15:19:18 +08:00
zombiej
2b22d6b19c bump rc-switch & update test case 2018-09-13 19:47:28 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
zombiej
bb5a14d858 fix #12083. Card inside tab-card should not change the title padding 2018-09-06 12:13:06 +08:00
包子熊
67024893ce Hotfix/icon issue (#12016)
* fix progress icon

* remove IconDisplay fields.js

* update progress test snapshot

* fix form item circle filled

* update form-item test snapshot

* fix close icon in upload item list

* fix alert icon theme

* update alert test snapshot

* fix time picker clear icon

* fix test snapshot

* fix rotate icon in the header

* update test snapshot

* update new tree test snapshot

* fix icon position

* fix old icon and new icon both display

* fix card actions icon position
2018-09-03 19:29:27 +08:00
HeskeyBaozi
2f8a56fa78 fix test case & update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
74798b8911 upgdate test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
afc163
ea762a3c88 update card loading demo 2018-09-02 16:45:12 +08:00
afc163
fef685a15b update snapshots 2018-09-02 16:45:12 +08:00
afc163
207bad7b47 Merge branch 'master' into feature-3.9.0 2018-09-01 13:22:06 +08:00
afc163
53304d3b5a Fix extra padding of Card.Grid
close #11996
2018-09-01 13:08:39 +08:00
afc163
bc7164d871 Allow fontSize works on Card[headStyle], close #11995 2018-09-01 12:58:52 +08:00
afc163
fecb3b6914 update card demo jsx format 2018-09-01 12:50:52 +08:00
陈帅
c73ad8021d
Merge pull request #11894 from ant-design/feature/svg-icon
Hotfix(Icon) fix SVG element style
2018-08-29 18:40:04 +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
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +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
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
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +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
HeskeyBaozi
8c4f98572b update tab snapshot 2018-08-16 16:15:25 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
35e56a41cd resolve conflict. 2018-07-31 16:33:20 +08:00
afc163
0156fef165 fix tabs ci in React 15 2018-07-31 15:50:27 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
afc163
a654d86d65 Merge branch 'master' into feature-3.8.0 2018-07-29 15:31:35 +08:00
afc163
42efc2927d fix card tabs demo 2018-07-29 15:31:20 +08:00
afc163
51d32baa62 fix tabs test snapshots 2018-07-29 15:19:59 +08:00
HeskeyBaozi
768af40c4c Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
#	components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
#	components/drawer/index.tsx
2018-07-25 12:03:00 +08:00
Emerson Laurentino
a88a320694 add headStyle to card component 2018-07-23 13:54:03 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
2018-07-23 09:58:55 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
afc163
152cae4d9f Fix Card tabs disable attribute, close #11212 2018-07-16 19:18:50 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
aa580beb8b docs: sort api table 2018-06-24 17:09:18 +08:00
Junbin Huang
bbf5cb75c3
chore: update typescript@~2.9.1 (#10748) 2018-06-02 20:12:09 +08:00
afc163
5ee4d20e2a should still have padding when card which set padding to 0 is loading 2018-05-03 15:17:04 +08:00
afc163
f4ae9294c0 Improve card loading style, ref #9862 2018-04-20 11:19:30 +08:00
Zheeeng
572ae5ce14 Bugfix issue.9862 (#10052)
* Fix issue 9862

* Update Card test snapshot
2018-04-20 10:44:33 +08:00
Zheeeng
d0d69fbf13 Remove useless style (#10054) 2018-04-19 11:50:28 +08:00
Zheeeng
b41af97d1f Fix typo (#10050) 2018-04-15 16:52:04 +08:00