From 10ee53e3bd943f10c92d6aa245178c0e4480635e Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Thu, 24 Nov 2022 10:57:04 +0800 Subject: [PATCH 1/4] fix: error palette --- components/theme/themes/seed.ts | 2 +- components/theme/themes/shared/genColorMapToken.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/theme/themes/seed.ts b/components/theme/themes/seed.ts index b7f06d55f648..032bded2b731 100644 --- a/components/theme/themes/seed.ts +++ b/components/theme/themes/seed.ts @@ -24,7 +24,7 @@ const seedToken: SeedToken = { colorPrimary: '#1677ff', colorSuccess: '#52c41a', colorWarning: '#faad14', - colorError: '#f5222d', + colorError: '#ff4d4f', colorInfo: '#1677ff', colorTextBase: '', diff --git a/components/theme/themes/shared/genColorMapToken.ts b/components/theme/themes/shared/genColorMapToken.ts index 716e518aef37..09dde2771be0 100644 --- a/components/theme/themes/shared/genColorMapToken.ts +++ b/components/theme/themes/shared/genColorMapToken.ts @@ -58,7 +58,7 @@ export default function genColorMapToken( colorErrorBorder: errorColors[3], colorErrorBorderHover: errorColors[4], colorErrorHover: errorColors[4], - colorError: errorColors[5], + colorError: errorColors[6], colorErrorActive: errorColors[7], colorErrorTextHover: errorColors[8], colorErrorText: errorColors[9], From a71e57e6c0cc35c61f581657b77615fd1e25895e Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Thu, 24 Nov 2022 11:28:39 +0800 Subject: [PATCH 2/4] chore: update doc --- docs/react/customize-theme.en-US.md | 2 +- docs/react/customize-theme.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/react/customize-theme.en-US.md b/docs/react/customize-theme.en-US.md index db935053085b..c51ef75c855f 100644 --- a/docs/react/customize-theme.en-US.md +++ b/docs/react/customize-theme.en-US.md @@ -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` | diff --git a/docs/react/customize-theme.zh-CN.md b/docs/react/customize-theme.zh-CN.md index 935e1829ba9c..622efd23a6aa 100644 --- a/docs/react/customize-theme.zh-CN.md +++ b/docs/react/customize-theme.zh-CN.md @@ -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` | From 676e69f08a429af952ebfd40da557bfbd6c25236 Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Thu, 24 Nov 2022 11:44:18 +0800 Subject: [PATCH 3/4] chore: update --- components/theme/themes/shared/genColorMapToken.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/theme/themes/shared/genColorMapToken.ts b/components/theme/themes/shared/genColorMapToken.ts index 09dde2771be0..a8ae0b56858c 100644 --- a/components/theme/themes/shared/genColorMapToken.ts +++ b/components/theme/themes/shared/genColorMapToken.ts @@ -57,7 +57,7 @@ export default function genColorMapToken( colorErrorBgHover: errorColors[2], colorErrorBorder: errorColors[3], colorErrorBorderHover: errorColors[4], - colorErrorHover: errorColors[4], + colorErrorHover: errorColors[5], colorError: errorColors[6], colorErrorActive: errorColors[7], colorErrorTextHover: errorColors[8], From 28035d3e7b9dd719e7aa800ced91e447618a5f89 Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Thu, 24 Nov 2022 21:10:00 +0800 Subject: [PATCH 4/4] fix: button danger border color --- components/button/style/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/button/style/index.tsx b/components/button/style/index.tsx index e6d52e9a8de4..077e7ec35f35 100644 --- a/components/button/style/index.tsx +++ b/components/button/style/index.tsx @@ -210,7 +210,7 @@ const genDefaultButtonStyle: GenerateStyle = (token) => ...genHoverActiveButtonStyle( { color: token.colorErrorHover, - borderColor: token.colorErrorBorder, + borderColor: token.colorErrorBorderHover, }, { color: token.colorErrorActive,