Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Card Tabs do not support small size #22666

Merged
merged 5 commits into from
Apr 1, 2020

Conversation

MrHeer
Copy link
Contributor

@MrHeer MrHeer commented Mar 27, 2020

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

close #22637

📝 Changelog

Language Changelog
🇺🇸 English fix Tabs do not support small size
🇨🇳 Chinese 修复 Tabs 不支持小尺寸

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Mar 27, 2020

@codesandbox-ci
Copy link

codesandbox-ci bot commented Mar 27, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 4bb1248:

Sandbox Source
antd reproduction template Configuration
大小 - Ant Design Demo Issue #22637

@MrHeer MrHeer force-pushed the fix-Card-Tabs-size branch from 0b9b800 to 6e37220 Compare March 28, 2020 01:45
@codecov
Copy link

codecov bot commented Mar 28, 2020

Codecov Report

Merging #22666 into master will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #22666      +/-   ##
==========================================
- Coverage   98.28%   98.28%   -0.01%     
==========================================
  Files         360      360              
  Lines        7213     7211       -2     
  Branches     1981     1981              
==========================================
- Hits         7089     7087       -2     
  Misses        124      124              
Impacted Files Coverage Δ
components/tabs/index.tsx 96.77% <ø> (-0.11%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc4d98a...4bb1248. Read the comment docs.

@MrHeer MrHeer requested a review from zombieJ March 28, 2020 01:46
@zombieJ
Copy link
Member

zombieJ commented Mar 28, 2020

Use same padding as normal mode: https://codesandbox.io/s/antd-reproduction-template-oysr5

截屏2020-03-28 上午10 43 08

截屏2020-03-28 上午10 43 14

@afc163
Copy link
Member

afc163 commented Mar 28, 2020

@MrHeer
Copy link
Contributor Author

MrHeer commented Mar 29, 2020

Use same padding as normal mode: codesandbox.io/s/antd-reproduction-template-oysr5

截屏2020-03-28 上午10 43 08 截屏2020-03-28 上午10 43 14

@zombieJ 我不太明白你的意思,能够说明一下吗?

@zombieJ
Copy link
Member

zombieJ commented Mar 29, 2020

和非标签卡片一样,用 padding 来控制一下 small size 的高度。

@MrHeer MrHeer force-pushed the fix-Card-Tabs-size branch from 7f09a0d to d626620 Compare March 29, 2020 03:06
@MrHeer
Copy link
Contributor Author

MrHeer commented Mar 29, 2020

@zombieJ 我修改了一下,请看一下是不是这样的

@zombieJ
Copy link
Member

zombieJ commented Mar 29, 2020

@MrHeer MrHeer force-pushed the fix-Card-Tabs-size branch 2 times, most recently from 9eec17d to eb636e2 Compare March 30, 2020 03:16
@afc163
Copy link
Member

afc163 commented Mar 30, 2020

@MrHeer
Copy link
Contributor Author

MrHeer commented Mar 30, 2020

这里搞个 demo 出来。

https://preview-22666-ant-design.surge.sh/components/tabs-cn/#components-tabs-demo-size

你的意思是把这个Demo中的普通Tabs修改为卡片类型的吗?

@afc163
Copy link
Member

afc163 commented Mar 30, 2020

加一个卡片 Tabs,好预览。

@MrHeer
Copy link
Contributor Author

MrHeer commented Mar 30, 2020

好的

@afc163
Copy link
Member

afc163 commented Mar 30, 2020

ci 挂了

@afc163
Copy link
Member

afc163 commented Mar 30, 2020

image

不太美观,加个间距。

@MrHeer MrHeer force-pushed the fix-Card-Tabs-size branch from 12df8c2 to 4bb1248 Compare March 30, 2020 14:46
@MrHeer
Copy link
Contributor Author

MrHeer commented Apr 1, 2020

还有什么问题吗?

@afc163 afc163 merged commit 3450a82 into ant-design:master Apr 1, 2020
@ycjcl868 ycjcl868 mentioned this pull request Apr 3, 2020
@afc163 afc163 mentioned this pull request Apr 7, 2020
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Card Tabs do not support small size
4 participants