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: Button padding token should follow contentFontSize #46901

Merged
merged 1 commit into from Jan 11, 2024

Conversation

MadCcc
Copy link
Member

@MadCcc MadCcc commented Jan 10, 2024

[中文版模板 / 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

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Fix Button that paddingBlock token didn't follow customized contentFontSize.
🇨🇳 Chinese 修复 Button 组件定制 token contentFontSizepaddingBlock 不会跟着改变的问题。

☑️ 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 Jan 10, 2024

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

Copy link
Contributor

github-actions bot commented Jan 10, 2024

Visual Regression Report for PR #46901 Failed ❌

Target branch: master (6fadbc8)
View Full Report


image name expected actual diff
button-component-token.png master: 6fadbc8e056de8fa2c331287d4448b88fd4f2ea1 current: pr-46901 diff
button-component-token.css-var.png master: 6fadbc8e056de8fa2c331287d4448b88fd4f2ea1 current: pr-46901 diff

Check Full Report for details

Copy link
Contributor

github-actions bot commented Jan 10, 2024

Preview Is ready

Copy link
Contributor

size-limit report 📦

Path Size
./dist/antd.min.js 329.14 KB (+134 B 🔺)
./dist/antd-with-locales.min.js 375.14 KB (+88 B 🔺)

Copy link

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 79cf122:

Sandbox Source
antd reproduction template (forked) Configuration

Copy link

codecov bot commented Jan 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (32052bf) 100.00% compared to head (79cf122) 100.00%.
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##            master    #46901   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          722       722           
  Lines        12444     12441    -3     
  Branches      3265      3265           
=========================================
- Hits         12444     12441    -3     

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

@MadCcc MadCcc merged commit c35e098 into master Jan 11, 2024
109 of 110 checks passed
@MadCcc MadCcc deleted the fix/button-token branch January 11, 2024 03:18
Copy link
Contributor

🎉 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 链接)。

@@ -492,7 +492,6 @@ export const prepareComponentToken: GetDefaultToken<'InputNumber'> = (token) =>
});

export const formatComponentToken: FormatComponentToken<'InputNumber'> = (token) => ({
...token,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个方法在 feature 上移到 ./style/token.ts 文件里面了,合并分支的时候冲突了,我顺手改了。cc @MadCcc

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

2 participants