fix(style): keep checkbox.group style the same as v4 #42103
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
MadCcc
reviewed
May 4, 2023
components/checkbox/style/index.ts
Outdated
| [`${checkboxCls}-group-item`]: { | ||
| ...resetComponent(token), | ||
|
|
||
| marginRight: '8px', |
There was a problem hiding this comment.
Suggested change
| marginRight: '8px', | |
| marginInlineEnd: token.marginXS |
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## master #42103 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 617 617
Lines 10545 10544 -1
Branches 2883 2883
=========================================
- Hits 10545 10544 -1
☔ View full report in Codecov by Sentry. |
added 4 commits
May 8, 2023 01:18
…o fix-checkbox-group
…o fix-checkbox-group
li-jia-nan
approved these changes
May 8, 2023
MadCcc
reviewed
May 8, 2023
components/checkbox/style/index.ts
Outdated
| @@ -36,6 +36,13 @@ export const genCheckboxStyle: GenerateStyle<CheckboxToken> = (token) => { | |||
| ...resetComponent(token), | |||
|
|
|||
| display: 'inline-flex', | |||
| flexWrap: 'wrap', | |||
| columnGap: '8px', | |||
|
|
MadCcc
reviewed
May 8, 2023
components/checkbox/style/index.ts
Outdated
| columnGap: '8px', | ||
|
|
||
| // Group > Grid | ||
| '.ant-row': { |
MadCcc
reviewed
May 8, 2023
components/checkbox/style/index.ts
Outdated
Comment on lines
43
to
45
| '.ant-row': { | ||
| width: '100%', | ||
| }, |
There was a problem hiding this comment.
Suggested change
| '.ant-row': { | |
| width: '100%', | |
| }, | |
| [`> ${token.antCls}-row`]: { | |
| flex: 1, | |
| }, |
ant前缀要用 token，这是动态的- flex 布局下用
flex: 1撑满 - 用
>只选择子代
|
|
get |
MadCcc
approved these changes
May 9, 2023
MadCcc
approved these changes
May 9, 2023
MadCcc
approved these changes
May 9, 2023
MadCcc
approved these changes
May 9, 2023
MadCcc
approved these changes
May 9, 2023
MadCcc
approved these changes
May 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[中文版模板 / Chinese template]
🤔 This is a ...
🔗 Related issue link
💡 Background and solution
📝 Changelog
☑️ Self-Check before Merge
🚀 Summary
🤖 Generated by Copilot at 1afca5d
Improved the styling of
checkboxandcheckbox.Groupcomponents to support flex and horizontal layouts. Modifiedcomponents/checkbox/style/index.tsto adjust the display and margin properties.🔍 Walkthrough
🤖 Generated by Copilot at 1afca5d
displaytoinline-blockand adding margin-right to checkbox group items (link)