Commit Graph

106 Commits

Author SHA1 Message Date
nikogu
abf18b9ec4 merge master 2017-09-18 10:13:48 +08:00
Wei Zhu
047f62e9b4 Mark refs to private (#7600) 2017-09-17 15:48:44 +08:00
Khalifa Lame
a4637526b9 Update Card English doc (#7630)
Fixed typos.
2017-09-16 11:28:18 +08:00
afc163
ea5ccce90d Merge branch 'master' into antd-3.0 2017-09-15 11:16:19 +08:00
afc163
5ac468167d Fix title and extra content position of narrow card
close #7604
2017-09-15 10:57:08 +08:00
afc163
fe12d8d579 Merge branch 'master' into antd-3.0 2017-09-06 21:44:47 +08:00
afc163
c7d6ce5d3f Fix Card.Grid broken style
https://gw.alipayobjects.com/zos/rmsportal/ZHuiCHkDSxOZZmZSbmXD.png
2017-09-06 21:14:16 +08:00
Khalifa Lame
8551b706cf Update Card English doc (#7440)
Fixed typo
2017-09-04 21:02:03 +08:00
ddcat1115
aa9f97dfda Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-24 10:45:02 +08:00
afc163
c355eae6d1 Fix node test 2017-08-24 10:05:55 +08:00
ddcat1115
b10f7726c3 Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-23 23:12:38 +08:00
ddcat1115
0d4baf302d 调整卡片样式 (#7286)
* 调整卡片样式

* improve
2017-08-23 19:02:27 +08:00
afc163
72f7232929 Add test cases for Card and Breadcrumb 2017-08-23 16:29:56 +08:00
afc163
b84b17d981 Merge branch 'master' into antd-3.0 2017-08-17 18:03:28 +08:00
afc163
b216597cfd Fix card grid bug 2017-08-17 17:20:28 +08:00
afc163
2318cd47a4 Merge from master 2017-08-15 22:50:00 +08:00
afc163
8dfb44ba72 update card snapshot 2017-08-15 22:36:48 +08:00
afc163
f46112d385 refactor card extra style 2017-08-15 22:34:48 +08:00
niko
600d589617 fixed some list style bug (#7177)
* fixed some list style bug

* add cursor:pointer to hover style

* fixed hover style
2017-08-15 17:25:14 +08:00
乐仪
314c095fbf Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-15 00:13:40 +08:00
ddcat1115
1c518c3d97 Card improve & bugfix (#7204)
* Card improve & bugfix

* update snap
2017-08-14 21:43:32 +08:00
偏右
a59bcf7e90 change noHovering to true defaultly (#7178) 2017-08-14 09:52:16 +08:00
Mitchell Demler
293d63910a Fix type definition for Card Component. (#7196)
React.Component requires two parameters. The second parameter (State) is now optional in a more recent version of @types/react however upgrading to this has several major/breaking changes elsewhere. I would prefer to explicitly define State as `{}` in this case.
2017-08-14 09:44:44 +08:00
乐仪
f8f34fc1f4 Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-09 15:59:29 +08:00
ddcat1115
2b1bed42c9 Card new feat (#7120)
* inner style Card

* support `cover` `actions` `avatar` `description` and `extraContent`

* improve

* refactor
2017-08-09 14:34:10 +08:00
afc163
3001ca4114 typo 2017-08-08 21:22:09 +08:00
afc163
02c5616250 Update Card demo 2017-08-08 21:21:49 +08:00
afc163
807b573bff Collapse the border or Card.Grid 2017-08-08 21:13:29 +08:00
afc163
1856fbe0df fix noHovering API typo, close #7078 2017-08-04 14:15:17 +08:00
afc163
bb7c580e4b Fix loading card padding 2017-08-02 21:15:02 +08:00
Randy
ecc18ef3a6 remove rc-util declaration (#7043) 2017-08-02 15:08:55 +08:00
Randy
b5ad05bc06 fix Card children type (#7030) 2017-07-31 20:29:56 +08:00
Randy
99e4cd6aec add rc-util declaration to custom-typings (#6935) 2017-07-29 14:17:02 +08:00
afc163
b54a70bc8e fix ummount issue, #6976 2017-07-29 14:16:27 +08:00
Neekey
6eff4bd02a check this.container exists updating WiderPadding (#6976)
before doing updating wider padding for Card, always check if the container exists first.
2017-07-29 14:12:53 +08:00
afc163
69775dea68 fix grid card padding implementation 2017-07-28 12:50:57 +08:00
afc163
e1a46cc419 Add less variables for wider card padding, resolve #6973 2017-07-27 12:05:58 +08:00
Randy
d28b8f3591 remove any type from Card component #5627 2017-07-22 21:12:55 +08:00
afc163
02fa2cd672 test: update snapshot 2017-07-14 16:10:52 +08:00
afc163
65a79b1ded remove -0.5px margin in card body 2017-07-14 16:10:04 +08:00
afc163
35e74f825e first card render without padding transition 2017-07-14 15:57:26 +08:00
afc163
953b84f7d1 tweak style 2017-07-14 12:16:37 +08:00
afc163
d04f9161db fix tsc compile error 2017-07-14 11:55:00 +08:00
afc163
da1bfba781 extra should be wider too 2017-07-14 11:50:35 +08:00
afc163
6ffe39145d Adjust card padding according to card width 2017-07-14 11:37:28 +08:00
偏右
a4648fd67f Add noHovering and Card.Grid (#6748)
* Add noHovering prop for Card

* Add Card.Grid

* fix snapshot

* change default card grid percent
2017-07-07 13:36:54 +08:00
afc163
36d24a5a40 Tweak card style 2017-07-05 19:21:26 +08:00
afc163
d7a29f682b upgrade Col span format in demo 2017-06-15 15:34:47 +08:00
Benjy Cui
e0db2f424e docs: update docs for Card, ref: #6225 2017-05-23 10:03:34 +08:00
Anas Tawfeek
f61b69cbb1 docs: adding the prop 'loading' to the properties table. (#6225) 2017-05-23 09:56:59 +08:00