Skip to content
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
2 changes: 1 addition & 1 deletion packages/theme/src/button-group/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

&:hover {
button:not(.disabled) {
background: var(--ti-button-group-item-btn-hover-bg-color);
background: var(--ti-button-group-item-btn-active-bg-color);
border-color: var(--ti-button-group-active-hover-border-color);

&.plain,
Expand Down
22 changes: 12 additions & 10 deletions packages/theme/src/button-group/smb-theme.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
export const tinyButtonGroupTheme = {
'ti-button-group-item-li-margin-right': 'var(--ti-common-space-2x)',
'ti-button-group-item-li-margin-bottom': 'var(--ti-common-space-2x)',
'ti-button-group-item-active-text-color': '#191919',
'ti-button-group-item-active-border-color': '#191919',
'ti-button-group-item-active-text-color': '#FFFFFF',
'ti-button-group-item-active-border-color': '#1476FF',
'ti-button-group-right-border-radius': 'var(--ti-common-border-radius-normal)',
'ti-button-group-middle-border-radius': 'var(--ti-common-border-radius-normal)',
'ti-button-group-left-border-radius': 'var(--ti-common-border-radius-normal)',
'ti-button-group-item-btn-text-color': '#595959',
'ti-button-group-item-active-bg-color': '#FFFFFF',
'ti-button-group-item-active-bg-color': '#1476FF',
'ti-button-group-item-btn-plain-bg-color': 'transparent',
'ti-button-group-plain-active-text-color': '#191919',
'ti-button-group-item-btn-hover-bg-color': 'transparent',
'ti-button-group-item-btn-hover-text-color': '#191919',
'ti-button-group-item-btn-hover-text-color': '#1476FF',
'ti-button-group-item-active-font-size': '12px',
'ti-button-group-item-margin-top': 'var(--ti-common-space-0)',
'ti-button-group-mini-margin-right': '4px',
'ti-button-group-mini-font-size': '12px',
'ti-button-group-item-btn-disabled-bg-color': 'rgba(0,0,0,0.05)',
'ti-button-group-item-btn-disabled-bg-color': 'transparent',
'ti-button-group-item-active-disabled-bg-color': 'rgba(0,0,0,0.05)',
'ti-button-group-item-btn-hover-border-color': '#c2c2c2',
'ti-button-group-active-hover-border-color': '#191919',
'ti-button-group-item-btn-hover-border-color': '#1476FF',
'ti-button-group-active-hover-border-color': '#1476FF',
'ti-button-group-btn-padding-horizontal': '24px',
'ti-button-group-mini-padding-horizontal': '16px',
'ti-button-group-item-btn-disabled-border-color': '#dbdbdb',
'ti-button-group-mini-border-radius': '4px',
'ti-button-group-no-border-hover-border-color': 'transparent',
'ti-button-group-no-border-hover-bg-color': 'rgba(0,0,0,0.05)',
'ti-button-group-no-border-active-hover-bg-color': '#FFFFFF',
'ti-button-group-no-border-border-color': '#191919',
'ti-button-group-no-border-active-hover-bg-color': '#1476FF',
'ti-button-group-no-border-border-color': '#1476FF',
'ti-button-group-item-bg-color': 'var(--ti-common-color-bg-white-normal)',
'ti-button-group-border-weight': 'var(--ti-common-border-weight-normal)'
'ti-button-group-border-weight': 'var(--ti-common-border-weight-normal)',
'ti-button-group-item-btn-active-hover-bg-color': '#1476FF',
'ti-button-group-item-btn-width': 'auto'
}
2 changes: 2 additions & 0 deletions packages/theme/src/button-group/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
--ti-button-group-item-btn-plain-border-color: var(--ti-common-color-bg-emphasize);
// 默认按钮选中项背景色
--ti-button-group-item-active-bg-color: var(--ti-common-color-bg-emphasize);
// 默认按钮选中项悬浮背景
--ti-button-group-item-btn-active-hover-bg-color: #beccfa;
// 朴素按钮选中项文本颜色
--ti-button-group-plain-active-text-color: var(--ti-common-color-bg-emphasize);
// 默认按钮选中项禁用时背景色
Expand Down
8 changes: 8 additions & 0 deletions packages/theme/src/button/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,14 @@
var(--ti-button-text-hover-weight),
);

&:hover {
text-decoration: var(--ti-button-text-hover-text-decoration);
}

&.is-disabled:hover {
text-decoration: none;
}

border-radius: var(--ti-button-text-hover-border-radius);

padding: 0 var(--ti-button-text-padding-horizontal);
Expand Down
5 changes: 3 additions & 2 deletions packages/theme/src/button/smb-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const tinyButtonSmbTheme = {
'ti-button-normal-border-color': '#595959',
'ti-button-border-radius': '25px',
'ti-button-text-color': 'var(--ti-common-color-text-highlight)',
'ti-button-text-hover-weight': 'var(--ti-common-font-weight-6)',
'ti-button-text-hover-weight': 'var(--ti-common-font-weight-4)',
'ti-button-text-color-hover': 'var(--ti-common-color-text-highlight)',
'ti-button-normal-hover-border-color': 'var(--ti-common-color-border)',
'ti-button-normal-disabled-border-color': 'transparent',
Expand Down Expand Up @@ -61,5 +61,6 @@ export const tinyButtonSmbTheme = {
'ti-button-text-size-mini-min-width': '24px',
'ti-button-text-size-mini-height': '24px',
'ti-button-text-size-mini-svg-width': '16px',
'ti-button-text-size-mini-svg-height': '16px'
'ti-button-text-size-mini-svg-height': '16px',
'ti-button-text-hover-text-decoration': 'underline'
}
2 changes: 2 additions & 0 deletions packages/theme/src/button/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@

// 文字按钮文本色
--ti-button-text-color: var(--ti-common-color-primary-normal);
// 文字按钮悬浮文本修饰(hide)
--ti-button-text-hover-text-decoration: none;
// 文字按钮悬浮文本色
--ti-button-text-color-hover: var(--ti-base-color-brand-5);
// 文字按钮悬浮文本字重
Expand Down
28 changes: 18 additions & 10 deletions packages/theme/src/checkbox-button/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
var(--ti-common-border-radius-normal) var(--ti-checkbox-button-left-border-radius);
}

&:not(.is-disabled).is-checked {
&.is-checked {
&::after {
content: '';
position: absolute;
Expand All @@ -44,7 +44,7 @@
right: 4px;
top: 0;
border-bottom: 20px solid transparent;
border-right: 20px solid #191919;
border-right: 20px solid var(--ti-checkbox-button-checked-bg-color);
border-top-right-radius: 6px;
display: var(--ti-checkbox-button-checked-display);
}
Expand Down Expand Up @@ -91,14 +91,24 @@
cursor: not-allowed;
background-image: none;
background-color: var(--ti-checkbox-button-disabled-bg-color);
border-color: var(--ti-checkbox-border-color);
border-color: var(--ti-checkbox-disabled-border-color);
box-shadow: none;
}

&:first-child .@{checkbox-button-prefix-cls}__inner {
border-left-color: var(--ti-checkbox-border-color);
}
}
&.is-disabled.is-checked {
&::after {
border-right: 20px solid var(--ti-checkbox-disabled-border-color);
}
.@{checkbox-button-prefix-cls}__inner {
color: var(--ti-checkbox-button-disabled-text-color);
border-color: var(--ti-checkbox-disabled-border-color);
background-color: var(--ti-checkbox-button-disabled-bg-color);
}
}

&__inner {
position: relative;
Expand All @@ -119,8 +129,7 @@
margin: 0 var(--ti-checkbox-button-margin-horizontal);
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
padding: 12px 20px;
font-size: var(--ti-common-font-size-2);
min-width: 80px;
font-size: var(--ti-checkbox-button-font-size);
border-radius: var(--ti-checkbox-button-border-radius);
.user-select(none);

Expand Down Expand Up @@ -189,19 +198,18 @@
}

&--mini {
&:not(.is-disabled).is-checked {
&.is-checked {
&::after {
border-bottom: 16px solid transparent;
border-right: 16px solid #000;
border-right: 16px solid var(--ti-checkbox-button-checked-border-color);
border-top-right-radius: 4px;
top: 2px;
right: 2px;
right: 3px;
}

&::before {
height: 8px;
width: 4px;
right: 4px;
right: 3px;
top: 1px;
}
}
Expand Down
15 changes: 9 additions & 6 deletions packages/theme/src/checkbox-button/smb-theme.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
export const tinyCheckboxButtonSmbTheme = {
'ti-checkbox-button-bg-color': '#fff',
'ti-checkbox-button-bg-color-hover': 'var(--ti-common-color-bg-hover)',
'ti-checkbox-button-hover-text-color': '#fff',
'ti-checkbox-button-bg-color-hover': '#fff',
'ti-checkbox-button-hover-text-color': '#1476FF',
'ti-checkbox-button-border-color': '#C2C2C2',
'ti-checkbox-button-hover-text-color': '#191919',
'ti-checkbox-button-border-color-hover': '#191919',
'ti-checkbox-button-border-color-hover': '#1476FF',
'ti-checkbox-button-right-border-radius': '6px',
'ti-checkbox-button-left-border-radius': '6px',
'ti-checkbox-button-border-radius': '6px',
'ti-checkbox-button-padding-horizontal': '16px',
'ti-checkbox-button-padding-vertical': '4px',
'ti-checkbox-button-height': '22px',
'ti-checkbox-button-height': '24px',
'ti-checkbox-button-margin-horizontal': '4px',
'ti-checkbox-button-mini-margin-horizontal': '2px',
'ti-checkbox-button-size-mini-font-size': 'var(--ti-common-font-size-0)',
Expand All @@ -19,9 +18,13 @@ export const tinyCheckboxButtonSmbTheme = {
'ti-checkbox-button-size-small-height': '32px',
'ti-checkbox-button-checked-display': 'block',
'ti-checkbox-button-disabled-bg-color': 'rgba(0,0,0,0.05)',
'ti-checkbox-button-checked-disabled-bg-color': 'rgba(0,0,0,0.05)',
'ti-checkbox-button-checked-disabled-border-color': '#dbdbdb',
'ti-checkbox-button-checked-disabled-text-color': '#C2C2C2',
'ti-checkbox-button-margin-top': '8px',
'ti-checkbox-button-mini-left-border-radius': '4px',
'ti-checkbox-button-mini-right-border-radius': '4px',
'ti-checkbox-button-mini-last-left-border-radius': '4px',
'ti-checkbox-button-mini-last-right-border-radius': '4px'
'ti-checkbox-button-mini-last-right-border-radius': '4px',
'ti-checkbox-button-checked-border-color': '#1476FF',
}
8 changes: 5 additions & 3 deletions packages/theme/src/checkbox-button/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
--ti-checkbox-button-bg-color: var(--ti-common-color-bg-light-normal);
// 按钮形式复选框选中项左边框阴影色(水平方向首个除外)
--ti-checkbox-shadow-color: #dfe1e6;
// 按钮形式复选框字号
--ti-checkbox-button-font-size: var(--ti-common-font-size-base);
// 按钮形式复选框未选中项悬浮文本色
--ti-checkbox-button-hover-text-color: var(--ti-common-color-text-primary);
// 按钮形式选中项边框色
Expand All @@ -23,7 +25,7 @@
--ti-checkbox-button-disabled-text-color: var(--ti-common-color-text-disabled);
// 按钮形式复选框垂直布局,选中项禁用时的背景色
--ti-checkbox-disabled-bg-color: var(--ti-common-color-bg-disabled);
// 按钮形式复选框非选中时,禁用背景色
// 按钮形式复选框禁用背景色
--ti-checkbox-button-disabled-bg-color: var(--ti-common-color-bg-disabled);
// 按钮形式复选框未选中项文本色
--ti-checkbox-button-text-color: var(--ti-common-color-info-normal);
Expand All @@ -37,6 +39,8 @@
--ti-checkbox-button-border-color-hover: #c2c2c2;
// 按钮组按钮圆角
--ti-checkbox-button-border-radius: 0px;
// 按钮组禁用边框色
--ti-checkbox-disabled-border-color: #dbdbdb;
// 按钮组小尺寸按钮水平内间距
--ti-checkbox-button-padding-horizontal: 15px;
// 按钮组小尺寸垂直间距、
Expand All @@ -61,8 +65,6 @@
--ti-checkbox-button-margin-top: 8px;
// 小尺寸按钮组按钮内间距
--ti-checkbox-button-padding-horizontal: 16px;
// 小尺寸按钮边框色
--ti-checkbox-border-color: #dbdbdb;
// 小尺寸按钮左侧圆角
--ti-checkbox-button-mini-left-border-radius: var(--ti-common-border-radius-normal);
// 小尺寸按钮右侧圆角
Expand Down
8 changes: 6 additions & 2 deletions packages/theme/src/checkbox/smb-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ export const tinyCheckboxSmbTheme = {
'ti-checkbox-icon-margin-top': '1px',
'ti-checkbox-icon-margin-left': '4px',
'ti-checkbox-button-checked-bg-color': '#FFFFFF',
'ti-checkbox-button-checked-text-color': '#191919',
'ti-checkbox-button-checked-text-color': '#1476FF',
'ti-checkbox-button-text-color': '#595959',
'ti-checkbox-button-bg-color-hover': '#FFFFFF',
'ti-checkbox-button-hover-text-color': '#191919'
'ti-checkbox-button-hover-text-color': '#191919',
'ti-checkbox-bg-color-checked': '#1476FF',
'ti-checkbox-border-color-checked': '#1476FF',
'ti-checkbox-bg-color-hover-checked': '#1476FF',
'ti-checkbox-border-color-hover-checked': '#1476FF'
}
31 changes: 31 additions & 0 deletions packages/theme/src/link/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
&&--additional {
&:after {
content: '';
width: var(--ti-link-underline-width);
position: absolute;
left: 0;
right: 0;
Expand All @@ -69,6 +70,10 @@
color: var(--ti-link-default-hover-text-color);
fill: var(--ti-link-default-hover-text-color);

g {
fill: var(--ti-link-default-hover-text-color);
}

&:after {
border-bottom-color: var(--ti-link-default-hover-border-color);
}
Expand All @@ -78,6 +83,10 @@
&:hover {
color: var(--ti-link-default-disabled-text-color);
fill: var(--ti-link-default-disabled-text-color);

g {
fill: var(--ti-link-default-disabled-text-color);
}
}

&:after {
Expand All @@ -93,6 +102,11 @@
font-weight: var(--ti-link-icon-hover-text-weight);
color: var(--ti-link-has-svg-hover-text-color);
fill: var(--ti-link-has-svg-hover-text-color);

g {
fill: var(--ti-link-has-svg-hover-text-color);
}

}

&:has(.@{svg-cls}).is-disabled {
Expand All @@ -101,11 +115,22 @@
color: var(--ti-link-default-disabled-text-color);
fill: var(--ti-link-default-disabled-text-color);
}

g {
fill: var(--ti-link-default-disabled-text-color);
}
}

&:has(.@{svg-cls}) {
g {
fill: var(--ti-link-default-disabled-text-color);
}
}
}

&.is-underline:hover:after {
content: '';
width: var(--ti-link-underline-width);
position: absolute;
left: 0;
right: 0;
Expand All @@ -126,6 +151,12 @@
var(--ti-link-default-hover-text-color),
var(--ti-link-default-disabled-text-color)
);

.@{svg-cls} {
g {
fill: var(--ti-link-default-text-color);
}
}
}

&&--primary {
Expand Down
10 changes: 6 additions & 4 deletions packages/theme/src/link/smb-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ export const tinyLinkSmbTheme = {
'ti-link-svg-height': '16px',
'ti-link-svg-margin-right': '4px',
'ti-link-font-weight': 'var(--ti-common-font-weight-4)',
'ti-link-default-border-display': 'block',
'ti-link-default-border-display': 'none',
'ti-link-default-hover-border-color': '#595959',
'ti-link-default-hover-text-color': '#595959',
'ti-link-default-text-color': 'var(--ti-common-color-line-active)',
'ti-link-default-hover-text-color': 'var(--ti-common-color-text-highlight)',
'ti-link-default-text-color': 'var(--ti-common-color-text-highlight)',
'ti-link-default-disabled-text-color': '#C2C2C2',
'ti-link-icon-hover-text-weight': 'var(--ti-common-font-weight-6)'
'ti-link-icon-hover-text-weight': 'var(--ti-common-font-weight-4)',
'ti-link-default-border-color': '#1476FF',
'ti-link-underline-width': 'calc(100% - 20px)'
}
2 changes: 2 additions & 0 deletions packages/theme/src/link/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
--ti-link-font-weight: var(--ti-common-font-weight-5);
// 链接下划线色(hide)
--ti-link-border-color: var(--ti-common-color-line-active);
// 链接下划线宽度(hide)
--ti-link-underline-width: 100%;
// 链接是否显示
--ti-link-display: inline;
// 链接图标宽度
Expand Down
8 changes: 8 additions & 0 deletions packages/theme/src/option/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
background-color: var(--ti-option-disabled-bg-color);
}
}
> :first-child {
color: var(--ti-option-selected-text-color);
}
}
}
}
Expand Down Expand Up @@ -74,6 +77,11 @@
.@{checkbox-prefix-cls}__inner {
border-color: var(--ti-option-checkbox-border-color-hover);
}
.halfselect .checked-sur {
.@{checkbox-prefix-cls}__inner {
border-color: var(--ti-option-checkbox-all-select-border-color-hover);
}
}
}

&.selected {
Expand Down
Loading