Skip to content

feat(radio): [radio] Adapting to the SMB theme #1982

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 4 commits into from
Aug 26, 2024
Merged

feat(radio): [radio] Adapting to the SMB theme #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7296969
feat(radio): [radio] Apating to the SMB theme
Youyou-smiles Aug 20, 2024
4b5edff
feat(radio): [radio] Adapting to the SMB theme
Youyou-smiles Aug 21, 2024
ad7bfcb
feat(radio): [radio] Adapting to the SMB theme
Youyou-smiles Aug 23, 2024
45ac02a
Merge branch 'dev' into lty/feat-radio
Youyou-smiles Aug 23, 2024
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
6 changes: 3 additions & 3 deletions packages/theme/src/radio-button/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@

&:disabled:checked {
& + .@{radio-button-prefix-cls}__inner {
background-color: var(--ti-radio-input-checked-disabled-bg-color);

background-color: var(--ti-radio-button-checked-disabled-bg-color);
color: var(--ti-radio-button-disabled-checked-text-color);
&,
&:hover {
border-color: var(--ti-radio-input-checked-disabled-border-color);
border-color: var(--ti-radio-button-checked-disabled-border-color);
}
}
}
Expand Down
20 changes: 19 additions & 1 deletion packages/theme/src/radio-button/smb-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/**
* Copyright (c) 2022 - present TinyVue Authors.
* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
*
* Use of this source code is governed by an MIT-style license.
*
* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
*
*/

export const tinyRadioButtonSmbTheme = {
'ti-radio-button-checked-normal-bg-color': '#1476FF',
'ti-radio-button-checked-normal-border-color': '#1476FF',
Expand All @@ -13,5 +25,11 @@ export const tinyRadioButtonSmbTheme = {
'ti-radio-button-child-right-border-radius': 'var(--ti-common-space-6)',
'ti-radio-button-padding-verticals': '9px',
'ti-radio-button-active-disabled-color': 'var(--ti-common-color-text-weaken)',
'ti-radio-button-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)'
'ti-radio-button-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
'ti-radio-button-checked-disabled-border-color': 'unset',
'ti-radio-button-bg-color': 'var(--ti-common-color-bg-normal)',
'ti-radio-button-checked-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
'ti-radio-button-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
'ti-radio-button-disabled-checked-text-color': 'var(--ti-common-color-text-weaken)',
'ti-radio-button-text-color': 'var(--ti-common-color-text-secondary)'
}
2 changes: 2 additions & 0 deletions packages/theme/src/radio-button/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
--ti-radio-button-checked-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
--ti-radio-button-checked-hover-box-shadow: -1px 0 0 0 var(--ti-common-color-primary-hover, #7693f5);
--ti-radio-button-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
--ti-radio-button-disabled-checked-text-color: var(--ti-common-color-text-weaken, #808080);
--ti-radio-button-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
--ti-radio-button-medium-font-size: var(--ti-common-font-size-1, 14px);
--ti-radio-button-margin-right: unset;
Expand All @@ -33,4 +34,5 @@
--ti-radio-button-padding-verticals: var(--ti-common-space-3x);
--ti-radio-button-active-disabled-color: var(--ti-common-color-text-weaken);
--ti-radio-button-active-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
--ti-radio-button-checked-disabled-bg-color: #bfbfbf;
Copy link
Member

@zzcr zzcr Aug 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个颜色不应该写成死值

}