Commit Graph

91 Commits

Author SHA1 Message Date
愚道
2f5537a65b Merge branch 'master' into chore/mergemaster 2019-09-02 10:47:32 +08:00
MrHeer
73554a2038 feat: allow disabling hover effect for Card.Grid (#18448) 2019-08-30 18:24:15 +08:00
afc163
a51f7a0508 test unmount 2019-08-27 18:31:01 +08:00
Artin
5e10d5ae7d Add tabBarExtraContent prop to Card (#18433) 2019-08-23 14:14:41 +08:00
zombieJ
41316e69e8
update snapshot (#16017) 2019-04-11 12:48:36 +08:00
偏右
ad99b4322d test: Add eslint-plugin-jest (#15825) 2019-04-03 15:54:26 +08:00
zombiej
2c693ee95b merge feature 2019-04-01 10:22:43 +08:00
zombieJ
0fd0faa8a7
Update Card & PageHeader style (#15755)
* rm Card auto padding

* rm related test case

* adjust pageHeader to 24px

* use less variable

* adjust style
2019-03-31 22:39:26 +08:00
afc163
95bd4d6903
🐛 Fix col element missing relative style
close #15626
2019-03-31 20:25:41 +08:00
zy410419243
2ee56a9c4a pref: spy on clearInterval for Upload & check actions for Card 2019-03-25 21:48:18 +08:00
zy410419243
6571a29a55 pref: instance() => simulate, for Card 2019-03-25 21:48:18 +08:00
zy410419243
53b9fd5204 test: update cases for Card 2019-03-25 21:48:17 +08:00
afc163
6ef24cf833 🐛 Fix Card loading style when there is actions
close #14832
2019-02-14 17:50:58 +08:00
zombiej
0a67272ae4 add locale update 2019-01-10 21:55:21 +08:00
zombiej
12af9a9dca icon add aria-label support 2019-01-10 21:55:21 +08:00
zombiej
874ed98e31 merge master 2019-01-02 17:12:34 +08:00
zombieJ
47fea7e8e6
update snapshot (#14042) 2019-01-02 15:25:10 +08:00
Nathan Broadbent
cbed63cb3e Added middle and small sizes for Card component 2018-12-11 19:31:28 +08:00
陈帅
8e11f0bdb9 merge support prettier 2018-12-07 20:02:01 +08:00
陈帅
dca9715186 support prettier 2018-12-07 18:27:30 +08:00
zombiej
9f5d421cd6 merge master 2018-11-30 14:48:37 +08:00
zombiej
aa16fdde86 update snapshot 2018-11-29 13:12:57 +08:00
zombieJ
95a76b0436
add tabs additional css (#13118)
fix #13086
2018-11-23 13:39:33 +08:00
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
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
陈帅
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
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