From da4738febf77fa20a506a8cc53e791d74bc8157a Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Tue, 6 Jun 2023 10:53:28 +0800 Subject: [PATCH] fix: use colorTextHeading (#42839) * fix: popconfirm title use colorTextHeading * fix: notification and alert --- components/alert/style/index.ts | 5 +++-- components/notification/style/index.tsx | 2 ++ components/popconfirm/style/index.tsx | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/alert/style/index.ts b/components/alert/style/index.ts index 52aed213dd..74628f09ae 100644 --- a/components/alert/style/index.ts +++ b/components/alert/style/index.ts @@ -1,7 +1,7 @@ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; +import { resetComponent } from '../../style'; import type { FullToken, GenerateStyle } from '../../theme/internal'; import { genComponentStyleHook, mergeToken } from '../../theme/internal'; -import { resetComponent } from '../../style'; export interface ComponentToken {} @@ -41,6 +41,7 @@ export const genBaseStyle: GenerateStyle = (token: AlertToken): CSSO alertPaddingHorizontal, paddingMD, paddingContentHorizontalLG, + colorTextHeading, } = token; return { @@ -108,7 +109,7 @@ export const genBaseStyle: GenerateStyle = (token: AlertToken): CSSO [`${componentCls}-message`]: { display: 'block', marginBottom: marginXS, - color: colorText, + color: colorTextHeading, fontSize: fontSizeLG, }, diff --git a/components/notification/style/index.tsx b/components/notification/style/index.tsx index 84b07dd6b0..c34335f8c6 100644 --- a/components/notification/style/index.tsx +++ b/components/notification/style/index.tsx @@ -45,6 +45,7 @@ const genNotificationStyle: GenerateStyle = (token) => { lineHeight, width, notificationIconSize, + colorText, } = token; const noticeCls = `${componentCls}-notice`; @@ -111,6 +112,7 @@ const genNotificationStyle: GenerateStyle = (token) => { [`${noticeCls}-description`]: { fontSize, + color: colorText, }, [`&${noticeCls}-closable ${noticeCls}-message`]: { diff --git a/components/popconfirm/style/index.tsx b/components/popconfirm/style/index.tsx index e62e1ba235..0f77bd6fee 100644 --- a/components/popconfirm/style/index.tsx +++ b/components/popconfirm/style/index.tsx @@ -19,6 +19,7 @@ const genBaseStyle: GenerateStyle = (token) => { marginXS, fontSize, fontWeightStrong, + colorTextHeading, } = token; return { @@ -41,6 +42,7 @@ const genBaseStyle: GenerateStyle = (token) => { [`${componentCls}-title`]: { fontWeight: fontWeightStrong, + color: colorTextHeading, '&:only-child': { fontWeight: 'normal',