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.

Sign up for GitHub

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

Jump to bottom

style: addon size should inherit from props #44000

Merged
merged 3 commits into from Aug 4, 2023
Merged

style: addon size should inherit from props #44000

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7eea7c1
style: addon size should inherit from props
MuxinFeng Aug 3, 2023
3941b04
fix: do not inherit when size equals small
MuxinFeng Aug 3, 2023
29fc90a
Merge branch 'master' into feat-input-addon
MuxinFeng Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/input-number/style/index.ts
View file
Open in desktop
Expand Up @@ -163,11 +163,13 @@ const genInputNumberStyles: GenerateStyle<InputNumberToken> = (token: InputNumbe
'&-lg': {
[`${componentCls}-group-addon`]: {
borderRadius: borderRadiusLG,
fontSize: token.fontSizeLG,
},
},
'&-sm': {
[`${componentCls}-group-addon`]: {
borderRadius: borderRadiusSM,
fontSize: token.fontSizeSM,
},
},

Expand Down
2 changes: 2 additions & 0 deletions components/input/style/index.ts
View file
Open in desktop
Expand Up @@ -700,11 +700,13 @@ const genGroupStyle: GenerateStyle<InputToken> = (token: InputToken) => {
'&-lg': {
[`${componentCls}-group-addon`]: {
borderRadius: borderRadiusLG,
fontSize: token.fontSizeLG,
},
},
'&-sm': {
[`${componentCls}-group-addon`]: {
borderRadius: borderRadiusSM,
fontSize: token.fontSizeSM,
Copy link
Member

Choose a reason for hiding this comment

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

小号的不一定要改，字体大小应该要和 input 一致

Copy link
Contributor Author

Choose a reason for hiding this comment

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

好的，addon 会默认给 14

},
},

Expand Down