Commit Graph

265 Commits

Author SHA1 Message Date
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
Wei Zhu
82b721a432 Extend CardProps from native div element attributes
Close #9933
2018-04-11 19:41:54 +08:00
ddcat1115
1612ef6990 fix #9882 2018-04-04 16:01:14 +08:00
u3u
30fe88d4bd Add the defaultActiveTabKey property for the Card component (#9526)
* Add the defaultActiveTabKey property for the Card component (close #8789, #8942)

* `activeTabKey` should be added

* Improve

* Fix large tabs font size, close #9509

* docs: Add TreeSelect[dropdownClassName]

* Fix passing dropdownClassName to tree-select

* build: update remark-parse requirement to ^5.0.0 (#9545)

Updates the requirements on [remark-parse](https://github.com/remarkjs/remark) to permit the latest version.
- [Release notes](https://github.com/remarkjs/remark/releases)
- [Commits](https://github.com/remarkjs/remark/commits/remark@5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* add Tooltip  contextMenu doc

* Improve Grid and Layout type definition

* fix: focus editor (#9548)

* Fix test case for new jsdom (#9527)

* Fix test case for new jsdom

* use setTimeout as raf in jest jsdom

* Fix cancelAnimationFrame

* Add comment for facebook/jest#5147

* longer timeout

* fix snap

* upgrade antd-tools

* Update typescript requirement to ~2.7.2 (#9522)

Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits/v2.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Fix a ts error

* build: update react-slick requirement to ~0.20.0 (#9543)

Updates the requirements on [react-slick](https://github.com/akiran/react-slick) to permit the latest version.
- [Changelog](https://github.com/akiran/react-slick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/akiran/react-slick/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Fix test cases

* site: fix intersection-observer polyfill

* docs: update recommendation

* Fix typo WeexPickerProps -> WeekPickerProps (#9564)

* use lodash

* Fixed typo on Visualization rules (#9575)

Style of a navigation should conform to the its level.

should be

Style of a navigation should conform to its level.

* Improve Radio/Checkbox type definition

Close #9574

* Remove AbstractCheckboxChangeEvent, fix TS4029 error

See https://github.com/Microsoft/TypeScript/issues/9944

* Update index.en-US.md (#9579)

* add transitionName from message.config (#9580)

* add transitionName from message.config

* Update index.en-US.md (#9579)

* modify doc

* build: update react-virtualized requirement to ~9.18.5 (#9544)

Updates the requirements on [react-virtualized](https://github.com/bvaughn/react-virtualized) to permit the latest version.
- [Changelog](https://github.com/bvaughn/react-virtualized/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bvaughn/react-virtualized/commits/9.18.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* When treeNode is disabled, its switcher is highlight and clickabled (#9539)

* When treeNode is disabled, its switcher is highlight and clickabled

* rc-tree@1.7.11

* Fix moment require (#9528)

Fix #9502

* Update snapshot
2018-03-10 14:44:12 +08:00
afc163
59b18b4c26 Fix card loading with empty children, close #9258 2018-02-06 11:45:22 +08:00
Wei Zhu
a9537e5934 Update snapshot 2018-02-02 12:33:39 +08:00
afc163
7a33a9e5d5 Fix extra wrapper of Card children, close #9226 2018-02-02 11:54:19 +08:00
Graeme Yeates
5931b201da Add @card-hover-border variable (#8939) 2018-01-12 10:03:14 +08:00
afc163
b49c0ac35c Fix snapshot test 2017-12-16 18:54:51 +08:00
afc163
3af6464db4 Fix Card Meta title text overflow, close #8597 2017-12-16 18:11:22 +08:00
afc163
2e45074fab Remove extra wrapper of Card 2017-12-05 13:36:52 +08:00
Wei Zhu
ebce4b3599 Fix implicit any error for Card 2017-11-22 11:07:19 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
afc163
1e1c6d1c72 Merge branch 'master' into antd-3.0 2017-11-16 19:58:20 +08:00
afc163
46d1296045 Fix async test cases 2017-11-16 17:12:36 +08:00
ddcat1115
7acf29bc9c tweak Card style 2017-10-27 15:08:10 +08:00
afc163
8f50324a94 Merge branch 'master' into antd-3.0 2017-10-26 19:34:11 +08:00
afc163
ad9809ec2e Fix extra padding of loading Card when it is too wide 2017-10-26 19:20:12 +08:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00
afc163
d8c9b77468 fix snapshot 2017-10-24 15:44:11 +08:00
afc163
2ef2925c8e update card and tabs style 2017-10-24 15:29:10 +08:00
afc163
a68dd71cff Tweak card background 2017-10-19 10:01:59 +08:00
afc163
b51bc4a63a update card demo 2017-10-18 21:20:11 +08:00
afc163
f33b1a279a update style 2017-10-18 19:45:41 +08:00
afc163
f87a64316a update style 2017-10-18 19:41:44 +08:00
偏右
ffffd0f4c5 Fix styles (#7924)
* update demo

* Fix styles

* fix snap

* Fix back-top ci
2017-10-18 17:16:14 +08:00
afc163
0b5f770fec fix card loading margin style 2017-10-17 17:01:26 +08:00
afc163
26e416c364 Tweak style 2017-10-16 19:56:04 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
偏右
2bced36f0c New component styles (#7731)
* Tweak button padding

* upgrade input and button size

* update form controls size

* update components size

* Add lemon color and update rate color

* Add new icons

* update layout style

* breadcrumb and dropdown

* update menu arrow width

* update layout and menu

* update steps

* fix var name

* update cascasder style

* Update DatePicker

* update InputNumber and Mention

* radio and switch

* select and transfer

* TimePicker & Upload

* more components

* calendar and list

* Tree Timeline Popover Tag

* divider modal popover

* update search input

* update card style

* update switch disabled opacity

* update shoadow and mask

* Add v2-compatible-reset.less

* Fix undefined className

* update snahshotssssssssssssssssss 👻
2017-09-27 22:32:49 +08:00
afc163
b4bf7198e7 Card noHovering => hoverable 2017-09-27 21:57:55 +08:00
ChaXinyu
14e2a56b75 export components interface (#7654)
* export components interface

* export specific props

* fix formItem missed import
2017-09-25 22:14:49 +08:00
afc163
412d7eebba Merge branch 'master' into antd-3.0 2017-09-22 18:37:08 +08:00
afc163
e7ccdfef74 Improve card variables 2017-09-22 18:34:31 +08:00
偏右
759b0bb821 seperate reset styles (#7682)
* seperate reset styles

* not reset ul/ol/p/heading

* revert reset.less idea

* move label style into ant-form-item, #5851

* revert reset.less idea

* update base.less

* Better typography from bootstrap@4

use reboot replace normalize

ref:
b4d84b9cdf/scss/_reboot.scss

close #6162
2017-09-22 18:33:29 +08:00
afc163
c2e9abddc7 Fix Card extra postion when no title 2017-09-22 15:28:27 +08:00
afc163
00973fdb72 Fix card tabs wrap bug 2017-09-20 21:56:56 +08:00
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
Benjy Cui
c097d5a9f5 Merge branch 'master' into feature-2.9 2017-03-20 11:29:36 +08:00
kossel
f5da1b6b16 Adjust card head style property from background to background-color (#5374)
* fix color variable naming

* card head  background-color => background, this adds more flexibility for the mixin
2017-03-18 15:16:03 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361)
* Upgeade to jest 19

* Use jest.spyOn
2017-03-17 18:56:30 +08:00
kossel
621f44e79c added card header style mixins (#5354)
* added card header style mixins

* fix color variable naming
2017-03-17 11:46:50 +08:00
afc163
0b62f77630 Tweak title color 2017-03-07 14:29:02 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
afc163
4ec6bf3bcd Fix a strange cover bug with Affix, close #4800 2017-02-09 11:43:41 +08:00
偏右
75a4b06e44 Unified border radius, close #4772 (#4773) 2017-02-08 14:21:29 +08:00
Graeme Yeates
1006015ef0 Add border customization variables (#4734)
* Add border customization variables (#4712)

* Make border styles customizable (fixes #4712)
2017-01-31 16:05:10 +08:00
Wei Zhu
77b78a9389 docs: Unify type naming (#4636)
* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
2017-01-20 20:10:50 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
afc163
08893a47cb fix card snap 2016-12-21 12:19:48 +08:00
afc163
847a60ee56 Learn card loading animation from hashnode.com 2016-12-20 12:22:45 +08:00
Benjy Cui
1351b5da5d refactor: remove splitObject 2016-12-19 15:19:15 +08:00
Wei Zhu
07103b9fb6 Don't ignore test files. 2016-12-14 14:48:09 +08:00
Wei Zhu
17a0a33283 Restructure tests. 2016-12-14 14:41:39 +08:00
Chris Kelly
ff2d55481e docs: Update loading.md (#4128) 2016-12-06 16:46:12 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055)
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
2016-11-30 10:20:23 +08:00
Benjy Cui
932443099a css: use @component-background, ref: #4040 2016-11-29 11:56:10 +08:00
cathayandy
addb6e44dc Fix #4039. Replace background-color: #fff with background: @body-background (#4040) 2016-11-29 09:54:54 +08:00
afc163
3c9272a60f Add hover z-index to cover other card 2016-11-17 14:29:48 +08:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758)
- Layout 更名为 Grid
2016-11-09 14:43:32 +08:00
afc163
0ec4276eab @font-size-lg (#1752) 2016-11-08 21:07:01 +08:00
afc163
d3788034e5 remove hover card border 2016-11-05 16:54:00 +08:00
feng zhi hao
0257e02e65 optimize declaration (#3531) 2016-10-21 16:27:26 +08:00
afc163
316958d8b0 Merge branch 'master' of github.com:ant-design/ant-design 2016-10-14 16:17:40 +08:00
afc163
d92a24d477 Improve overlay border design 2016-10-14 15:40:39 +08:00
xiaofan2406
10afe1372f flexible Card title wrapper (#3416) 2016-10-14 14:41:21 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
feng zhi hao
a4be70334d chore: fix some error declaration (#3099) 2016-09-21 09:27:58 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024)
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
2016-09-14 16:18:33 +08:00
Benjy Cui
8db2b79505 chore: fix compile errors 2016-09-13 15:31:29 +08:00
afc163
0e6f677ff9 Fix doc headings 2016-09-10 13:43:30 +08:00
Vadim Macagon
70f16295bd docs: Improve English docs for the Card component (#2537) 2016-07-29 13:43:48 +08:00
afc163
730dbc72f7 Add typings 2016-07-14 18:15:59 +08:00
afc163
2e41e35cc6 Fix more tslint problems 2016-07-13 17:22:23 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
95351bfffa Merge branch '1.x-stable' 2016-06-27 19:31:38 +08:00
afc163
089f1ae512 update components category name 2016-06-27 18:21:12 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
afc163
bf7c63b208 update card demo 2016-06-17 15:39:05 +08:00