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

fix: update icon color token in Select #39644

Merged
merged 1 commit into from Dec 19, 2022
Merged

fix: update icon color token in Select #39644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion components/cascader/style/index.tsx
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ const genBaseStyle: GenerateStyle<CascaderToken> = (token) => {
'&:hover': {
background: token.controlItemBgHover,
},
' &-disabled': {
Copy link
Member

Choose a reason for hiding this comment

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

这种感觉应该直接用工具发现和报错。

Copy link
Member Author

Choose a reason for hiding this comment

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

结果而言没啥影响，但是这个想要检查出来只能运行时分析了

Copy link
Member Author

Choose a reason for hiding this comment

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

反而 string 类型的 cssinjs 好做 lint

'&-disabled': {
color: token.colorTextDisabled,
cursor: 'not-allowed',

Expand Down
4 changes: 2 additions & 2 deletions components/input/style/index.tsx
View file
Open in desktop
Expand Up @@ -537,7 +537,7 @@ const genAllowClearStyle = (token: InputToken): CSSObject => {
// ========================= Input =========================
[`${componentCls}-clear-icon`]: {
margin: 0,
color: token.colorIcon,
color: token.colorTextQuaternary,
fontSize: token.fontSizeIcon,
verticalAlign: -1,
// https://github.com/ant-design/ant-design/pull/18151
Expand All @@ -546,7 +546,7 @@ const genAllowClearStyle = (token: InputToken): CSSObject => {
transition: `color ${token.motionDurationSlow}`,

'&:hover': {
color: token.colorTextDescription,
color: token.colorTextTertiary,
},

'&:active': {
Expand Down
6 changes: 3 additions & 3 deletions components/select/style/index.tsx
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@ const genBaseStyle: GenerateStyle<SelectToken> = (token) => {
insetInlineEnd: inputPaddingHorizontalBase,
height: token.fontSizeIcon,
marginTop: -token.fontSizeIcon / 2,
color: token.colorTextDisabled,
color: token.colorTextQuaternary,
fontSize: token.fontSizeIcon,
lineHeight: 1,
textAlign: 'center',
Expand Down Expand Up @@ -207,7 +207,7 @@ const genBaseStyle: GenerateStyle<SelectToken> = (token) => {
width: token.fontSizeIcon,
height: token.fontSizeIcon,
marginTop: -token.fontSizeIcon / 2,
color: token.colorTextDisabled,
color: token.colorTextQuaternary,
fontSize: token.fontSizeIcon,
fontStyle: 'normal',
lineHeight: 1,
Expand All @@ -224,7 +224,7 @@ const genBaseStyle: GenerateStyle<SelectToken> = (token) => {
},

'&:hover': {
color: token.colorTextDescription,
color: token.colorTextTertiary,
},
},

Expand Down