From 64bc4a242d2f29f3139b24607a8edac7d0e2a9c8 Mon Sep 17 00:00:00 2001 From: wuyiping0628 <1106773985@qq.com> Date: Tue, 27 May 2025 00:11:35 -0700 Subject: [PATCH] fix(tag): theme sass warning token value refresh, tag component style specification refresh --- packages/theme-saas/src/tag/index.less | 8 ++++---- packages/theme-saas/theme/theme.json | 12 ++++++------ packages/vue/src/tag/src/token.ts | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/theme-saas/src/tag/index.less b/packages/theme-saas/src/tag/index.less index 3b0d02943b..015da66279 100644 --- a/packages/theme-saas/src/tag/index.less +++ b/packages/theme-saas/src/tag/index.less @@ -73,9 +73,9 @@ &&--warning { .tag-variant( - theme('colors.color.warning.DEFAULT'), + theme('colors.color.warning.bold'), theme('colors.transparent'), - theme('colors.color.warning.subtler'), + theme('colors.color.warning.subtle'), theme('colors.color.warning.DEFAULT'), theme('colors.color.warning.DEFAULT'), theme('colors.color.warning.subtle') @@ -131,7 +131,7 @@ &--dark&--warning { .tag-dark-variant( - theme('colors.color.text.inverse'), + theme('colors.color.text.primary'), theme('colors.color.warning.DEFAULT'), theme('colors.color.bg.6'), theme('colors.color.icon.inverse') @@ -193,8 +193,8 @@ &--plain&--warning { .tag-variant( + theme('colors.color.warning.active'), theme('colors.color.warning.DEFAULT'), - theme('colors.color.warning.subtle'), theme('colors.color.bg.1'), theme('colors.color.warning.DEFAULT'), theme('colors.color.warning.DEFAULT'), diff --git a/packages/theme-saas/theme/theme.json b/packages/theme-saas/theme/theme.json index 42b54a4a85..f660bac19b 100644 --- a/packages/theme-saas/theme/theme.json +++ b/packages/theme-saas/theme/theme.json @@ -117,13 +117,13 @@ { "title": "功能色 - 提醒 Functional Color - Warning", "colors": { - "color-warning": "yellow-600,100", + "color-warning": "yellow-500,100", "color-warning-hover": "yellow-400,100", "color-warning-active": "yellow-600,100", "color-warning-disabled": "yellow-100,100", - "color-warning-bold": "yellow-700,100", + "color-warning-bold": "yellow-800,100", "color-warning-subtle": "yellow-200,100", - "color-warning-subtler": "yellow-100,100" + "color-warning-subtler": "yellow-50,100" } }, { @@ -557,13 +557,13 @@ { "title": "功能色 - 提醒 Functional Color - Warning", "colors": { - "color-warning": "yellow-600,100", + "color-warning": "yellow-500,100", "color-warning-hover": "yellow-400,100", "color-warning-active": "yellow-600,100", "color-warning-disabled": "yellow-100,100", - "color-warning-bold": "yellow-700,100", + "color-warning-bold": "yellow-800,100", "color-warning-subtle": "yellow-200,100", - "color-warning-subtler": "yellow-100,100" + "color-warning-subtler": "yellow-50,100" } }, { diff --git a/packages/vue/src/tag/src/token.ts b/packages/vue/src/tag/src/token.ts index 8322b8abd2..4edc052876 100644 --- a/packages/vue/src/tag/src/token.ts +++ b/packages/vue/src/tag/src/token.ts @@ -3,7 +3,7 @@ export const classes = { 'dark-success': 'text-color-text-inverse bg-color-success', 'dark-alerting': 'text-color-text-inverse bg-color-alert', - 'dark-warning': 'text-color-text-inverse bg-color-warning', + 'dark-warning': 'text-color-text-primary bg-color-warning', 'dark-error': 'text-color-text-inverse bg-color-error', 'dark-default': 'text-color-text-inverse bg-color-info-primary', 'dark-info': 'text-color-text-inverse bg-color-text-placeholder', @@ -13,7 +13,7 @@ export const classes = { 'light-success': 'text-color-success bg-color-success-subtler', 'light-alerting': 'text-color-alert bg-color-alert-subtler', - 'light-warning': 'text-color-warning bg-color-warning-subtler', + 'light-warning': 'text-color-warning-bold bg-color-warning-subtle', 'light-error': 'text-color-error bg-color-error-subtler', 'light-default': 'text-color-info-primary bg-color-info-primary-subtler', 'light-info': 'text-color-text-primary bg-color-bg-3', @@ -23,7 +23,7 @@ export const classes = { 'plain-success': 'text-color-success bg-color-bg-1', 'plain-alerting': 'text-color-alert bg-color-bg-1', - 'plain-warning': 'text-color-warning bg-color-bg-1', + 'plain-warning': 'text-color-warning-active bg-color-bg-1', 'plain-error': 'text-color-error bg-color-bg-1', 'plain-default': 'text-color-info-primary bg-color-bg-1', 'plain-info': 'text-color-text-primary bg-color-bg-1', @@ -33,7 +33,7 @@ export const classes = { 'success-border': 'border-color-success-subtle', 'alerting-border': 'border-color-alert-subtle', - 'warning-border': 'border-color-warning-subtle', + 'warning-border': 'border-color-warning', 'error-border': 'border-color-error-subtle', 'default-border': 'border-color-info-primary-subtle', 'info-border': 'border-color-none',