Skip to content

fix(tag): theme saas warning token value refresh, tag component style specification refresh #3463

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

Merged
merged 2 commits into from
May 27, 2025
Merged

fix(tag): theme saas warning token value refresh, tag component style specification refresh #3463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64bc4a2
fix(tag): theme sass warning token value refresh, tag component style…
wuyiping0628 May 27, 2025
dbef62f
Merge branch 'dev' of github.com:opentiny/tiny-vue into wyp/token-0527
wuyiping0628 May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/theme-saas/src/tag/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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'),
Expand Down
12 changes: 6 additions & 6 deletions packages/theme-saas/theme/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down Expand Up @@ -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"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions packages/vue/src/tag/src/token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
Loading