Skip to content

Commit 348cd6e

Browse files
feat(button): [button] Adapting to the SMB theme (#1937)
1 parent 21618ea commit 348cd6e

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

packages/theme/src/button/index.less

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
.@{svg-prefix-cls} {
5353
vertical-align: text-top;
54+
font-size: var(--ti-button-icon-font-size);
5455
}
5556

5657
& > img {
@@ -59,6 +60,7 @@
5960
}
6061

6162
&.is-only-icon {
63+
width: var(--ti-button-only-icon-width);
6264
min-width: var(--ti-button-only-icon-min-width);
6365
padding: 0 var(--ti-button-only-icon-padding-horizontal);
6466
border-radius: var(--ti-button-only-icon-border-radius);
@@ -204,7 +206,6 @@
204206
&.is-loading {
205207
.@{svg-prefix-cls} {
206208
margin-right: 4px;
207-
margin-top: 1px;
208209
}
209210
}
210211
}
@@ -435,6 +436,7 @@
435436
}
436437

437438
&.is-only-icon {
439+
width: var(--ti-button-only-icon-text-width);
438440
&:hover {
439441
background: var(--ti-button-text-only-icon-hover-bg-color);
440442
}
@@ -538,6 +540,11 @@
538540
var(--ti-button-size-mini-min-width),
539541
);
540542
}
543+
.@{css-prefix-iconfont}-loading {
544+
font-size: var(--ti-button-loading-font-size);
545+
line-height: 1;
546+
animation: rotating 2s linear infinite;
547+
}
541548
}
542549

543550
.@{css-prefix-iconfont}-loading {

packages/theme/src/button/smb-theme.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ export const tinyButtonSmbTheme = {
2020
'ti-button-size-medium-min-width': 'var(--ti-common-size-28x)',
2121
'ti-button-size-normal-min-width': 'var(--ti-common-size-24x)',
2222
'ti-button-size-small-min-width': 'var(--ti-common-size-18x)',
23-
'ti-button-danger-plain-hover-bg-color': 'transparent',
24-
'ti-button-danger-plain-hover-text-color': '#F76360',
25-
'ti-button-danger-plain-hover-border-color': '#F76360',
23+
'ti-button-danger-plain-hover-bg-color': 'var(--ti-common-color-bg-minor-hover)',
24+
'ti-button-danger-plain-hover-text-color': 'var(--ti-common-color-error-text)',
25+
'ti-button-danger-plain-hover-border-color': 'var(--ti-common-color-error-border-secondary)',
2626
'ti-button-danger-plain-disabled-border-color': 'transparent',
2727
'ti-button-normal-hover-border-color': '#C2C2C2',
2828
'ti-button-size-large-font-size': 'var(--ti-common-font-size-base)',
@@ -41,6 +41,7 @@ export const tinyButtonSmbTheme = {
4141
'ti-button-text-svg-padding-horizontal': '0px',
4242
'ti-button-size-small-font-size': '12px',
4343
'ti-button-loading-bg-color': 'rgba(255, 255, 255, 0.5)',
44+
'ti-button-loading-font-size': 'var(--ti-common-font-size-2)',
4445
'ti-button-size-mini-font-size': '12px',
4546
'ti-button-size-large-margin-left': '16px',
4647
'ti-button-size-medium-margin-left': '16px',
@@ -67,8 +68,11 @@ export const tinyButtonSmbTheme = {
6768
'ti-button-text-size-mini-svg-height': '16px',
6869
'ti-button-text-hover-text-decoration': 'underline',
6970
'ti-button-only-icon-min-width': 'unset',
70-
'ti-button-only-icon-padding-horizontal': '8px',
71-
'ti-button-only-icon-border-radius': '6px',
71+
'ti-button-icon-font-size': 'var(--ti-common-font-size-2)',
72+
'ti-button-only-icon-width': 'var(--ti-common-size-8x)',
73+
'ti-button-only-icon-text-width': 'var(--ti-common-size-6x)',
74+
'ti-button-only-icon-padding-horizontal': '7px',
75+
'ti-button-only-icon-border-radius': 'var(--ti-common-border-radius-1)',
7276
'ti-button-only-icon-border-color': '#c2c2c2',
7377
'ti-button-only-icon-hover-border-color': '#191919',
7478
'ti-button-only-icon-disabled-border-color': '#dbdbdb',

packages/theme/src/button/vars.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
--ti-button-border-style: var(--ti-common-border-style-solid, solid);
2424
// 按钮加载时背景色
2525
--ti-button-loading-bg-color: rgba(255, 255, 255, 0.35);
26+
--ti-button-loading-font-size: var(--ti-common-font-size-1);
2627

2728
// 默认按钮最小宽度
2829
--ti-button-size-normal-min-width: var(--ti-common-size-width-normal, 80px);
@@ -439,7 +440,11 @@
439440
--ti-button-text-size-mini-svg-height: 1em;
440441

441442
// 纯图标按钮最小宽度
443+
--ti-button-icon-font-size: var(--ti-common-font-size-1);
444+
// 纯图标/文字按钮宽度
445+
--ti-button-only-icon-width: var(--ti-common-size-7x);
442446
--ti-button-only-icon-min-width: unset;
447+
--ti-button-only-icon-text-width: unset
443448
// 纯图标按钮水平内边距
444449
--ti-button-only-icon-padding-horizontal: 7px;
445450
// 纯图标按钮边框圆角

0 commit comments

Comments
 (0)