Skip to content

Commit

Permalink
fix: error palette (#38933)
Browse files Browse the repository at this point in the history
* fix: error palette

* chore: update doc

* chore: update

* fix: button danger border color
  • Loading branch information
MadCcc authored and li-jia-nan committed Nov 25, 2022
1 parent 22e3925 commit a315c6e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion components/button/style/index.tsx
Expand Up @@ -210,7 +210,7 @@ const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) =>
...genHoverActiveButtonStyle(
{
color: token.colorErrorHover,
borderColor: token.colorErrorBorder,
borderColor: token.colorErrorBorderHover,
},
{
color: token.colorErrorActive,
Expand Down
2 changes: 1 addition & 1 deletion components/theme/themes/seed.ts
Expand Up @@ -24,7 +24,7 @@ const seedToken: SeedToken = {
colorPrimary: '#1677ff',
colorSuccess: '#52c41a',
colorWarning: '#faad14',
colorError: '#f5222d',
colorError: '#ff4d4f',
colorInfo: '#1677ff',
colorTextBase: '',

Expand Down
4 changes: 2 additions & 2 deletions components/theme/themes/shared/genColorMapToken.ts
Expand Up @@ -57,8 +57,8 @@ export default function genColorMapToken(
colorErrorBgHover: errorColors[2],
colorErrorBorder: errorColors[3],
colorErrorBorderHover: errorColors[4],
colorErrorHover: errorColors[4],
colorError: errorColors[5],
colorErrorHover: errorColors[5],
colorError: errorColors[6],
colorErrorActive: errorColors[7],
colorErrorTextHover: errorColors[8],
colorErrorText: errorColors[9],
Expand Down
2 changes: 1 addition & 1 deletion docs/react/customize-theme.en-US.md
Expand Up @@ -323,7 +323,7 @@ export default () => {
| colorPrimary | 品牌主色 | `string` | `#1677ff` |
| colorSuccess | 成功色 | `string` | `#52c41a` |
| colorWarning | 警戒色 | `string` | `#faad14` |
| colorError | 错误色 | `string` | `#f5222d` |
| colorError | 错误色 | `string` | `#ff4d4f` |
| colorInfo | 信息色 | `string` | `#1677ff` |
| colorTextBase | 基础文本色 | `string` | `#000` |
| colorTextLightSolid | 亮色文本色 | `string` | `#fff` |
Expand Down
2 changes: 1 addition & 1 deletion docs/react/customize-theme.zh-CN.md
Expand Up @@ -323,7 +323,7 @@ export default () => {
| colorPrimary | 品牌主色 | `string` | `#1677ff` |
| colorSuccess | 成功色 | `string` | `#52c41a` |
| colorWarning | 警戒色 | `string` | `#faad14` |
| colorError | 错误色 | `string` | `#f5222d` |
| colorError | 错误色 | `string` | `#ff4d4f` |
| colorInfo | 信息色 | `string` | `#1677ff` |
| colorTextBase | 基础文本色 | `string` | `#000` |
| colorTextLightSolid | 亮色文本色 | `string` | `#fff` |
Expand Down

0 comments on commit a315c6e

Please sign in to comment.