Skip to content

Commit 86e214f

Browse files
feat(popconfirm): [popconfirm] Apating to the SMB thmem (#1955)
1 parent 2b643a1 commit 86e214f

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

packages/theme/src/popconfirm/index.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252

5353
&__title {
5454
flex: 1 1 auto;
55+
font-size: var(--ti-popconfirm-popover-title-font-size);
56+
font-weight: var(--ti-popconfirm-popover-title-font-weight);
5557
}
5658

5759
&__content {
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
export const tinyPopconfirmSmbTheme = {
22
'ti-popconfirm-margin-right': 'var(--ti-common-space-6x)',
3-
'ti-popconfirm-popover-footer-justify-content': 'center',
4-
'ti-popconfirm-popover-container-padding-vertical': '7px',
3+
'ti-popconfirm-popover-footer-justify-content': 'right',
4+
'ti-popconfirm-popover-container-padding-vertical': 'unset',
55
'ti-popconfirm-popover-footer-font-color': '#191919',
6-
'ti-popconfirm-popover-icon-width': 'var(--ti-common-size-4x)'
6+
'ti-popconfirm-popover-icon-width': 'var(--ti-common-size-4x)',
7+
'ti-popconfirm-popover-title-font-weight': 'var(--ti-common-font-weight-bold)',
8+
'ti-popconfirm-popover-title-font-size': 'var(--ti-common-font-size-2)',
9+
'ti-popconfirm-popover-icon-margin-right': 'var(--ti-common-space-base)'
710
}

packages/theme/src/popconfirm/vars.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@
2727
--ti-popconfirm-popover-icon-margin-right: var(--ti-common-space-2x, 8px);
2828
// 提示弹窗底部按钮容器上侧外边距
2929
--ti-popconfirm-popover-footer-margin-top: var(--ti-common-space-4x, 16px);
30+
// 标题字重、大小
31+
--ti-popconfirm-popover-title-font-size: var(--ti-common-font-size-1);
32+
--ti-popconfirm-popover-title-font-weight: var(--ti-common-font-weight-normal, 400);
3033
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
export const tinyPopperSmbTheme = {
22
'ti-popover-box-shadow': '0px 2px 12px 0px rgba(0,0,0,0.08)',
3-
'ti-popover-border-radius': '8px',
4-
'ti-popover-padding-vertical': '9px',
5-
'ti-popover-padding-horizontal': '16px',
3+
'ti-popover-border-radius': 'var(--ti-common-border-radius-4)',
4+
'ti-popover-padding-vertical': 'var(--ti-common-space-4x)',
5+
'ti-popover-padding-horizontal': 'var(--ti-common-space-4x)',
66
'ti-popover-border-color': 'transparent',
77
'ti-popover-arrow-border-color': 'transparent',
8-
'ti-popover-arrow-height': '8px',
8+
'ti-popover-arrow-height': 'var(--ti-common-space-2x)',
99
'ti-popover-line-height': '20px'
1010
}

packages/vue/src/popconfirm/src/pc.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
:placement="placement"
88
trigger="manual"
99
:width="width"
10-
:title="title"
1110
:popper-class="'tiny-popconfirm-popover ' + (customClass || '')"
1211
:popper-options="popperOptions"
1312
:append-to-body="popperAppendToBody"

0 commit comments

Comments
 (0)