Skip to content
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.

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

fix(theme): fix(theme): The correct default value is added to improve the overall theme adaptation development efficiency. #2190

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions packages/theme/src/action-menu/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

.component-css-vars-action-menu() {
// 按钮文本字重
--ti-action-menu-font-weight: var(--ti-common-font-weight-normal);
--ti-action-menu-font-weight: var(--ti-common-font-weight-normal, 400);
// 按钮文本装饰
--ti-action-menu-hover-text-decoration: underline;
// 更多...图标的宽度
--ti-action-menu-more-icon-width: var(--ti-common-size-4x);
--ti-action-menu-more-icon-width: var(--ti-common-size-4x, 16px);
// 更多...图标的高度
--ti-action-menu-more-icon-height: var(--ti-common-size-4x);
--ti-action-menu-more-icon-height: var(--ti-common-size-4x, 16px);
// 更多...图标的右边外边距
--ti-action-menu-more-icon-margin-right: var(--ti-common-space-0, 0px);
// 下拉触发源文本颜色
Expand All @@ -30,11 +30,11 @@
// 分割线颜色
--ti-action-menu-item-line-bg-color: transparent;
// 分割线宽度
--ti-action-menu-item-line-width: var(--ti-common-space-0);
--ti-action-menu-item-line-width: var(--ti-common-space-0, 0px);
// 下拉菜单项悬浮背景色
--ti-action-menu-item-hover-bg-color: transparent;
// 下拉菜单项文本悬浮色
--ti-action-menu-item-hover-text-color: var(--ti-common-color-text-link);
--ti-action-menu-item-hover-text-color: var(--ti-common-color-text-link, #1476ff);
// 下拉菜单项图标悬浮色
--ti-action-menu-item-hover-icon-color: var(--ti-common-color-text-link-hover, #1476ff); // 没有这个颜色的图标色
// 下拉菜单项图标顶部内边距
Expand All @@ -46,7 +46,7 @@
// 下拉菜单项图标左侧内边距
--ti-action-menu-item-svg-margin-left: var(--ti-common-space-0, 0px);
// 下拉菜单卡片模式字体颜色
--ti-action-menu-item-card-text-color: var(--ti-common-color-text-primary);
--ti-action-menu-item-card-text-color: var(--ti-common-color-text-primary, #191919);
// 下拉菜单卡片模式字体颜色
--ti-action-menu-item-card-hover-text-color: var(--ti-common-color-text-primary);
--ti-action-menu-item-card-hover-text-color: var(--ti-common-color-text-primary, #191919);
}
106 changes: 53 additions & 53 deletions packages/theme/src/alert/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
'Microsoft JhengHei'
);
// 边框厚度(new)
--ti-alert-border-weight: var(--ti-common-size-0);
--ti-alert-border-weight: var(--ti-common-size-0, 0px);
// 描述字号
--ti-alert-description-font-size: var(--ti-common-font-size-base, 12px);
--ti-alert-description-font-size: var(--ti-common-font-size-base, 14px);
// 默认关闭图标固定定位顶部距离(hide)
--ti-alert-close-position-top: var(--ti-common-space-3x);
--ti-alert-close-position-top: var(--ti-common-space-3x, 12px);
// 默认关闭图标字号
--ti-alert-close-font-size: var(--ti-common-font-size-2);
--ti-alert-close-font-size: var(--ti-common-font-size-2, 16px);
// 自定义关闭文字字号
--ti-alert-close-text-font-size: var(--ti-common-font-size-base, 12px);
--ti-alert-close-text-font-size: var(--ti-common-font-size-base, 14px);
// 组件圆角
--ti-alert-border-radius: var(--ti-common-border-radius-4);
--ti-alert-border-radius: var(--ti-common-border-radius-4, 8px);
// 标题文本色
--ti-alert-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-title-text-color: var(--ti-common-color-text-primary, #191919);
// success类型标题文本色
--ti-alert-success-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-success-title-text-color: var(--ti-common-color-text-primary, #191919);
// info类型标题文本色
--ti-alert-info-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-info-title-text-color: var(--ti-common-color-text-primary, #191919);
// warning类型标题文本色
--ti-alert-warning-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-warning-title-text-color: var(--ti-common-color-text-primary, #191919);
// error类型标题文本色
--ti-alert-error-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-error-title-text-color: var(--ti-common-color-text-primary, #191919);
// simple类型标题文本色
--ti-alert-simple-title-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-alert-simple-title-text-color: var(--ti-common-color-text-primary, #191919);
// 标题字号
--ti-alert-title-font-size: var(--ti-common-font-size-2);
--ti-alert-title-font-size: var(--ti-common-font-size-2, 16px);
// 标题图标字号
--ti-alert-icon-font-size: var(--ti-common-font-size-2, 16px);
// 描述内容行高
Expand All @@ -57,100 +57,100 @@
// 描述内容水平内边距
--ti-alert-normal-content-padding-horizontal: var(--ti-common-space-2x, 8px);
// 描述内容提示内容顶部外边距
--ti-alert-description-margin-top: var(--ti-common-space-base);
--ti-alert-description-margin-top: var(--ti-common-space-base, 4px);
// 描述内容提示内容底部外边距
--ti-alert-description-margin-bottom: var(--ti-common-space-0);
--ti-alert-description-margin-bottom: var(--ti-common-space-0, 0px);
// 描述默认文本色
--ti-alert-description-text-color: var(--ti-common-color-text-secondary, #575d6c);
--ti-alert-description-text-color: var(--ti-common-color-text-secondary, #595959);
// 默认顶部内边距
--ti-alert-normal-padding-top: calc(var(--ti-common-space-2x) + 1.5px);
--ti-alert-normal-padding-top: calc(var(--ti-common-space-2x, 8px) + 1.5px);
// 默认右内边距
--ti-alert-normal-padding-right: var(--ti-common-space-4x);
--ti-alert-normal-padding-right: var(--ti-common-space-4x, 16px);
// 默认底部内边距
--ti-alert-normal-padding-bottom: calc(var(--ti-common-space-2x) + 1.5px);
--ti-alert-normal-padding-bottom: calc(var(--ti-common-space-2x, 8px) + 1.5px);
// 默认左内边距
--ti-alert-normal-padding-left: var(--ti-common-space-4x, 16px);
// 默认垂直外边距
--ti-alert-normal-margin-vertical: var(--ti-common-space-4x);
--ti-alert-normal-margin-vertical: var(--ti-common-space-4x, 16px);
// 默认水平外边距
--ti-alert-normal-margin-horizontal: var(--ti-common-space-0, 0px);
// large尺寸顶部内边距
--ti-alert-large-padding-top: var(--ti-common-space-4x);
--ti-alert-large-padding-top: var(--ti-common-space-4x, 16px);
// large尺寸底部内边距
--ti-alert-large-padding-bottom: var(--ti-common-space-4x);
--ti-alert-large-padding-bottom: var(--ti-common-space-4x, 16px);
// large尺寸左内边距
--ti-alert-large-padding-left: var(--ti-common-space-4x, 16px);
// large尺寸右内边距
--ti-alert-large-padding-right: var(--ti-common-space-4x);
--ti-alert-large-padding-right: var(--ti-common-space-4x, 16px);
// large尺寸操作文本色
--ti-alert-opration-text-color: var(--ti-common-color-text-highlight, #526ecc);
--ti-alert-opration-text-color: var(--ti-common-color-text-highlight, #1476ff);
// large尺寸操作字号
--ti-alert-opration-font-size: var(--ti-common-font-size-base, 12px);
--ti-alert-opration-font-size: var(--ti-common-font-size-base, 14px);
// large尺寸图标字号
--ti-alert-large-icon-font-size: var(--ti-common-font-size-4, 24px);
--ti-alert-large-icon-font-size: var(--ti-common-font-size-4, 20px);
// large尺寸描述内容左内边距
--ti-alert-large-content-padding-left: var(--ti-common-space-2x);
--ti-alert-large-content-padding-left: var(--ti-common-space-2x, 8px);
// 大尺寸关闭图标字号
--ti-alert-large-close-font-size: var(--ti-alert-close-font-size);

// warning类型边框色
--ti-alert-warning-border-color: var(--ti-common-color-warn-border, #ffd0a6);
--ti-alert-warning-border-color: var(--ti-common-color-warn-border, #ffebd1);
// warning类型图标色
--ti-alert-warning-icon-color: var(--ti-common-color-warn, #fa9841);
--ti-alert-warning-icon-color: var(--ti-common-color-warn, #ff8800);
// warning类型链接色(hide)
--ti-alert-warning-link-text-color: var(--ti-common-color-warn-text, #e37d29);
--ti-alert-warning-link-text-color: var(--ti-common-color-warn-text, #ff8800);
// warning类型背景色
--ti-alert-warning-bg-color: var(--ti-common-color-warn-bg, #fff3e8);
--ti-alert-warning-bg-color: var(--ti-common-color-warn-bg, #ffebd1);
// warning类型关闭图标色
--ti-alert-warning-close-icon-color: var(--ti-common-color-text-weaken);
--ti-alert-warning-close-icon-color: var(--ti-common-color-text-weaken, #808080);
// warning类型悬浮关闭图标色
--ti-alert-warning-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
--ti-alert-warning-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover, #7693f5);
// error类型边框色
--ti-alert-error-border-color: var(--ti-common-color-error-border-secondary, #ffbcba);
--ti-alert-error-border-color: var(--ti-common-color-error-border-secondary, #fce3e1);
// error类型图标色
--ti-alert-error-icon-color: var(--ti-common-color-error, #f66f6a);
--ti-alert-error-icon-color: var(--ti-common-color-error, #f23030);
// error类型链接色(hide)
--ti-alert-error-link-text-color: var(--ti-common-color-error-text, #de504e);
--ti-alert-error-link-text-color: var(--ti-common-color-error-text, #f23030);
// error类型背景色
--ti-alert-error-bg-color: var(--ti-common-color-error-bg, #ffeeed);
--ti-alert-error-bg-color: var(--ti-common-color-error-bg, #fce3e1);
// error类型关闭图标色
--ti-alert-error-close-icon-color: var(--ti-common-color-text-weaken);
--ti-alert-error-close-icon-color: var(--ti-common-color-text-weaken, #808080);
// error类型悬浮关闭图标色
--ti-alert-error-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
--ti-alert-error-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover, #7693f5);
// success类型边框色
--ti-alert-success-border-color: var(--ti-common-color-success-border, #acf2dc);
--ti-alert-success-border-color: var(--ti-common-color-success-border, #e6f2d5);
// success类型图标色
--ti-alert-success-icon-color: var(--ti-common-color-success, #50d4ab);
--ti-alert-success-icon-color: var(--ti-common-color-success, #5cb300);
// success类型链接色(hide)
--ti-alert-success-link-text-color: var(--ti-common-color-text-success, #3ac295);
--ti-alert-success-link-text-color: var(--ti-common-color-text-success, #5cb300);
// success类型背景色
--ti-alert-success-bg-color: var(--ti-common-color-success-bg, #edfff9);
--ti-alert-success-bg-color: var(--ti-common-color-success-bg, #e6f2d5);
// success类型关闭图标色
--ti-alert-success-close-icon-color: var(--ti-common-color-text-weaken);
--ti-alert-success-close-icon-color: var(--ti-common-color-text-weaken, #808080);
// success类型悬浮关闭图标色
--ti-alert-success-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
--ti-alert-success-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover, #7693f5);

// info类型边框色
--ti-alert-info-border-color: var(--ti-common-color-prompt-border, #beccfa);
--ti-alert-info-border-color: var(--ti-common-color-prompt-border, #deecff);
// info类型图标色
--ti-alert-info-icon-color: var(--ti-common-color-prompt, #5e7ce0);
--ti-alert-info-icon-color: var(--ti-common-color-prompt, #1476ff);
// info类型链接色(hide)
--ti-alert-info-link-text-color: var(--ti-common-color-prompt-text, #526ecc);
--ti-alert-info-link-text-color: var(--ti-common-color-prompt-text, #1476ff);
// info类型背景色
--ti-alert-info-bg-color: var(--ti-common-color-prompt-bg, #ebf6ff);
--ti-alert-info-bg-color: var(--ti-common-color-prompt-bg, #deecff);
// info类型关闭图标色
--ti-alert-info-close-icon-color: var(--ti-common-color-text-weaken);
--ti-alert-info-close-icon-color: var(--ti-common-color-text-weaken, #808080);
// info类型悬浮关闭图标色
--ti-alert-info-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
--ti-alert-info-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover, #7693f5);

// simple类型边框色
--ti-alert-simple-border-color: var(--ti-common-color-info-border, #d3d4d6);
// simple类型图标色
--ti-alert-simple-icon-color: #808080;
// simple类型链接色(hide)
--ti-alert-simple-link-text-color: var(--ti-common-color-primary-active, #7693f5);
--ti-alert-simple-link-text-color: var(--ti-common-color-primary-active, #595959);
// simple类型背景色
--ti-alert-simple-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
--ti-alert-simple-bg-color: var(--ti-common-color-bg-disabled, #f0f0f0);
// simple类型关闭图标色
--ti-alert-simple-close-icon-color: var(--ti-alert-simple-icon-color);
// simple类型悬浮关闭图标色
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/amount/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
*/

.component-css-vars-amount() {
--ti-amount-icon-color: var(--ti-base-color-brand-6, #5e7ce0);
--ti-amount-icon-color: var(--ti-base-color-brand-6, #191919);
--ti-amount-icon-font-size: var(--ti-common-font-size-1, 14px);
}
20 changes: 10 additions & 10 deletions packages/theme/src/autocomplete/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@

.component-css-vars-autocomplete() {
// 下拉框边框圆角
--ti-autocomplete-suggestion-border-radius: var(--ti-common-border-radius-normal, 2px);
--ti-autocomplete-suggestion-border-radius: var(--ti-common-border-radius-normal, 6px);
// 下拉框边框色
--ti-autocomplete-suggestion-border-color: var(--ti-common-color-transparent, transparent);
// 下拉框背景色
--ti-autocomplete-suggestion-bg-color: var(--ti-common-color-bg-white-normal, #fff);
--ti-autocomplete-suggestion-bg-color: var(--ti-common-color-bg-white-normal, #ffffff);
// 下拉框列表项横向填充长度
--ti-autocomplete-li-padding-horizontal: var(--ti-common-size-4x);
--ti-autocomplete-li-padding-horizontal: var(--ti-common-size-4x, 16px);
// 下拉框列表项竖向填充长度
--ti-autocomplete-li-padding-vertical: 5px;
// 下拉框列表项的文本色
--ti-autocomplete-li-text-color: var(--ti-common-color-text-primary, #252b3a);
--ti-autocomplete-li-text-color: var(--ti-common-color-text-primary, #191919);
// 下拉框列表项字号
--ti-autocomplete-li-font-size: var(--ti-common-font-size-base, 12px);
--ti-autocomplete-li-font-size: var(--ti-common-font-size-base, 14px);
// 下拉框列表项的悬浮背景色
--ti-autocomplete-li-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
--ti-autocomplete-li-hover-bg-color: var(--ti-common-color-hover-background, #f5f5f5);
// 下拉框列表选中项的背景色
--ti-autocomplete-li-select-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
--ti-autocomplete-li-select-bg-color: var(--ti-common-color-selected-background, #f5f5f5);
// 下拉框列表选中项的文本色
--ti-autocomplete-li-selected-text-color: var(--ti-common-color-selected-text-color, #fff);
--ti-autocomplete-li-selected-text-color: var(--ti-common-color-selected-text-color, #191919);
// 每项的分配者的边框色(没有效果)
--ti-autocomplete-li-divider-border-color: var(--ti-common-color-dark, #000);
// 下拉框列表项行高
--ti-autocomplete-li-height: 22px;
// 加载图标色(没有效果
--ti-autocomplete-loading-text-color: var(--ti-common-color-placeholder, #adb0b8);
--ti-autocomplete-loading-text-color: var(--ti-common-color-placeholder, #808080);
// 下拉框面板与输入框的间隙
--ti-autocomplete-dropdown-gap: var(--ti-common-dropdown-gap);
--ti-autocomplete-dropdown-gap: var(--ti-common-dropdown-gap, 4px);
}
30 changes: 15 additions & 15 deletions packages/theme/src/badge/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
*/

.component-css-vars-badge() {
--ti-badge-size: var(--ti-common-font-size-2);
--ti-badge-font-size: var(--ti-common-font-size-0);
--ti-badge-line-height: calc(var(--ti-common-line-height-base) - 4px);
--ti-badge-font-weight: var(--ti-common-font-weight-normal);
--ti-badge-border-radius: var(--ti-common-border-radius-4);
--ti-badge-text-color: var(--ti-base-color-bg-7);
--ti-badge-bg-color: var(--ti-base-color-error);
--ti-badge-link-hover-text-color: var(--ti-common-color-light, #fff);
--ti-badge-active-text-color: var(--ti-base-color-brand-6, #5e7ce0);
--ti-badge-active-bg-color: var(--ti-common-color-light, #fff);
--ti-badge-primary-bg-color: var(--ti-base-color-brand-6, #5e7ce0);
--ti-badge-success-bg-color: var(--ti-common-color-success-normal, #50d4ab);
--ti-badge-warning-bg-color: var(--ti-common-color-warning-normal, #fa9841);
--ti-badge-size: var(--ti-common-font-size-2, 16px);
--ti-badge-font-size: var(--ti-common-font-size-0, 12px);
--ti-badge-line-height: calc(var(--ti-common-line-height-base, 18px) - 4px);
--ti-badge-font-weight: var(--ti-common-font-weight-normal, 400);
--ti-badge-border-radius: var(--ti-common-border-radius-4, 8px);
--ti-badge-text-color: var(--ti-base-color-bg-7, #ffffff);
--ti-badge-bg-color: var(--ti-base-color-error, #f23030);
--ti-badge-link-hover-text-color: var(--ti-common-color-light, #ffffff);
--ti-badge-active-text-color: var(--ti-base-color-brand-6, #191919);
--ti-badge-active-bg-color: var(--ti-common-color-light, #ffffff);
--ti-badge-primary-bg-color: var(--ti-base-color-brand-6, #191919);
--ti-badge-success-bg-color: var(--ti-common-color-success-normal, #5cb300);
--ti-badge-warning-bg-color: var(--ti-common-color-warning-normal, #ff8800);
--ti-badge-danger-bg-color: var(--ti-base-color-error-3, #f66f6a);
--ti-badge-info-bg-color: var(--ti-common-color-info-normal, #252b3a);
--ti-badge-border: var(--ti-common-border-weight-normal);
--ti-badge-info-bg-color: var(--ti-common-color-info-normal, #191919);
--ti-badge-border: var(--ti-common-border-weight-normal, 1px);
--ti-badge-margin-left: 0;
}
Loading
Loading