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: sibling Tags should have margin #47736

Merged
merged 9 commits into from Mar 6, 2024
Merged

fix: sibling Tags should have margin #47736

merged 9 commits into from Mar 6, 2024

Conversation

MadCcc
Copy link
Member

@MadCcc MadCcc commented Mar 6, 2024

  • fix: sibling Tag should have margin
  • chore: update snapshot

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Workflow
  • Other (about what?)

🔗 Related issue link

#47504 (comment)

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Revert code that removed margin of Tag.
🇨🇳 Chinese 回滚移除 Tag 默认间距的代码。

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

  • 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

Copy link

stackblitz bot commented Mar 6, 2024

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

github-actions bot commented Mar 6, 2024

Preview is ready

Copy link
Contributor

github-actions bot commented Mar 6, 2024

👁 Visual Regression Report for PR #47736 Failed ❌

🎯 Target branch: master (c2493a8)
📖 View Full Report ↗︎

Image name Expected Actual Diff
qr-code-Popover.dark.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.compact.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.compact.css-var.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.dark.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.dark.css-var.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.default.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
select-custom-tag-render.default.css-var.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
table-basic.compact.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
table-basic.compact.css-var.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff
table-basic.dark.png master: c2493a8c192312869c3c9181ad3425f92cbe7ccf current: pr-47736 diff

Check Full Report for details

@MadCcc
Copy link
Member Author

MadCcc commented Mar 6, 2024

@powerfulyang

Copy link
Contributor

github-actions bot commented Mar 6, 2024

size-limit report 📦

Path Size
./dist/antd.min.js 334.22 KB (-27 B 🔽)
./dist/antd-with-locales.min.js 380.27 KB (+25 B 🔺)

Copy link

codesandbox-ci bot commented Mar 6, 2024

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.

@yoyo837
Copy link
Contributor

yoyo837 commented Mar 6, 2024

@powerfulyang 这里

@afc163
Copy link
Member

afc163 commented Mar 6, 2024

回滚了?

@yoyo837
Copy link
Contributor

yoyo837 commented Mar 6, 2024

回滚了?

不算回滚吧,二次修复咯

@afc163
Copy link
Member

afc163 commented Mar 6, 2024

关联一下issue

Copy link

codecov bot commented Mar 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (c2493a8) to head (413754f).

Additional details and impacted files
@@            Coverage Diff            @@
##            master    #47736   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          736       736           
  Lines        12637     12637           
  Branches      3323      3323           
=========================================
  Hits         12637     12637           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@powerfulyang
Copy link

powerfulyang commented Mar 6, 2024

<Tag>GPU</Tag>Nvidia A100 这种,因为自带样式显示有距离。
现在去掉 margin 两个粘一起啦,我倒不是连续的 tag

@MadCcc
Copy link
Member Author

MadCcc commented Mar 6, 2024

<Tag>GPU</Tag>Nvidia A100 这种,因为自带样式显示有距离。 现在去掉 margin 两个粘一起啦,我倒不是连续的 tag

这个场景确实,这边还是先 revert 了

li-jia-nan
li-jia-nan previously approved these changes Mar 6, 2024
li-jia-nan
li-jia-nan previously approved these changes Mar 6, 2024
zombieJ
zombieJ previously approved these changes Mar 6, 2024
@MadCcc MadCcc dismissed stale reviews from zombieJ and li-jia-nan via 4d9d9e7 March 6, 2024 12:49
@MadCcc MadCcc merged commit 0652c32 into master Mar 6, 2024
68 of 72 checks passed
@MadCcc MadCcc deleted the fix/tag-margin branch March 6, 2024 13:51
Copy link
Contributor

github-actions bot commented Mar 6, 2024

🎉 Thank you for your contribution! If you have not yet joined our DingTalk community group, please feel free to join us (when joining, please provide the link to this PR).

🎉 感谢您的贡献!如果您还没有加入钉钉社区群,请扫描下方二维码加入我们(加群时请提供此 PR 链接)。

@MadCcc
Copy link
Member Author

MadCcc commented Mar 13, 2024

#47736 (comment)
加一个 marginInlineEnd token

tanzhenyun pushed a commit to DraculaPrince/mark15 that referenced this pull request Mar 29, 2024
* fix: sibling Tag should have margin

* chore: update snapshot

* chore: revert

* chore: link issue

* docs: update demo

* Revert "demo: update Grid、Table、Select demo (ant-design#47709)"

This reverts commit c01c1b5.

* chore: update snapshot

* chore: update demo
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.

None yet

7 participants