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(Grid): Offset settings not being overwritten under different screens #41309

Merged
merged 1 commit into from
Mar 19, 2023

Conversation

Yuiai01
Copy link
Contributor

@Yuiai01 Yuiai01 commented Mar 17, 2023

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

close #41142

💡 Background and solution

在当前 Col 组件中,如果不同屏幕下的 offset 有差异的话,会出现问题,如下:
修改前,lg 本身 offset 为 0,但是由于 md 上存在 offset,所以页面元素产生偏移
image

修改后,lg 本身的 offset 覆盖了 md 的 offset,所以页面元素没有产生偏移。
image

📝 Changelog

Language Changelog
🇺🇸 English Fixed offset Settings not being overwritten under different screens
🇨🇳 Chinese 修复不同屏幕下的 offset 设置不会被覆盖

☑️ 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

@github-actions
Copy link
Contributor

github-actions bot commented Mar 17, 2023

@codecov
Copy link

codecov bot commented Mar 17, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (39adae8) 100.00% compared to head (4220912) 100.00%.

Additional details and impacted files
@@            Coverage Diff            @@
##            master    #41309   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          610       610           
  Lines        10494     10452   -42     
  Branches      2868      2848   -20     
=========================================
- Hits         10494     10452   -42     
Impacted Files Coverage Δ
components/grid/style/index.ts 100.00% <ø> (ø)

... and 5 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@afc163 afc163 merged commit 41c4386 into ant-design:master Mar 19, 2023
@PeachScript PeachScript mentioned this pull request Mar 20, 2023
20 tasks
RedJue pushed a commit to RedJue/ant-design that referenced this pull request Apr 25, 2023
RedJue pushed a commit to RedJue/ant-design that referenced this pull request Apr 25, 2023
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.

Grid 使用xs sm响应式时,sm offset 0 不会覆盖 xs offset 非0
2 participants