diff --git a/examples/sites/demos/pc/app/popconfirm/basic-usage-composition-api.vue b/examples/sites/demos/pc/app/popconfirm/basic-usage-composition-api.vue index ced48a442..6d2bd2ab3 100644 --- a/examples/sites/demos/pc/app/popconfirm/basic-usage-composition-api.vue +++ b/examples/sites/demos/pc/app/popconfirm/basic-usage-composition-api.vue @@ -13,5 +13,5 @@ import { ref } from 'vue' import { Popconfirm as TinyPopconfirm, Button as TinyButton } from '@opentiny/vue' const title = ref('这是气泡标题') -const message = ref('这是气泡确认框提示内容文本描述,这是两行内容的展示样式,文本内容很长很长。') +const message = ref('这是气泡确认框提示内容文本描述,这是两行内容的展示样式。') diff --git a/examples/sites/demos/pc/app/popconfirm/basic-usage.vue b/examples/sites/demos/pc/app/popconfirm/basic-usage.vue index 36fbd963e..5dbf83ff9 100644 --- a/examples/sites/demos/pc/app/popconfirm/basic-usage.vue +++ b/examples/sites/demos/pc/app/popconfirm/basic-usage.vue @@ -19,7 +19,7 @@ export default { data() { return { title: '这是气泡标题', - message: '这是气泡确认框提示内容文本描述,这是两行内容的展示样式,文本内容很长很长。' + message: '这是气泡确认框提示内容文本描述,这是两行内容的展示样式。' } } } diff --git a/packages/theme/src/popconfirm/index.less b/packages/theme/src/popconfirm/index.less index efee76f8c..e3169a20a 100644 --- a/packages/theme/src/popconfirm/index.less +++ b/packages/theme/src/popconfirm/index.less @@ -42,6 +42,10 @@ display: flex; align-items: center; line-height: var(--ti-popconfirm-popover-line-height); + margin-bottom: var(--ti-popconfirm-popover-margin-bottomt);; + } + .no-message { + font-weight: 400; } &__icon { @@ -57,7 +61,7 @@ } &__content { - color: #5c6976; + color: var(--ti-popconfirm-popover-text-color); line-height: var(--ti-popconfirm-popover-line-height); } diff --git a/packages/theme/src/popconfirm/smb-theme.js b/packages/theme/src/popconfirm/smb-theme.js index 568e0f37f..1fb26544e 100644 --- a/packages/theme/src/popconfirm/smb-theme.js +++ b/packages/theme/src/popconfirm/smb-theme.js @@ -6,5 +6,8 @@ export const tinyPopconfirmSmbTheme = { 'ti-popconfirm-popover-icon-width': 'var(--ti-common-size-4x)', 'ti-popconfirm-popover-title-font-weight': 'var(--ti-common-font-weight-bold)', 'ti-popconfirm-popover-title-font-size': 'var(--ti-common-font-size-2)', - 'ti-popconfirm-popover-icon-margin-right': 'var(--ti-common-space-base)' + 'ti-popconfirm-popover-icon-margin-right': 'var(--ti-common-space-base)', + 'ti-popconfirm-popover-margin-bottomt': '8px', + 'ti-popconfirm-popover-text-color': '#191919', + 'ti-popconfirm-popover-line-height': '1.5' } diff --git a/packages/theme/src/popconfirm/vars.less b/packages/theme/src/popconfirm/vars.less index 4263d97dd..31c22d732 100644 --- a/packages/theme/src/popconfirm/vars.less +++ b/packages/theme/src/popconfirm/vars.less @@ -30,4 +30,5 @@ // 标题字重、大小 --ti-popconfirm-popover-title-font-size: var(--ti-common-font-size-1); --ti-popconfirm-popover-title-font-weight: var(--ti-common-font-weight-normal, 400); + --ti-popconfirm-popover-text-color: #5c6976; } diff --git a/packages/vue/src/popconfirm/src/pc.vue b/packages/vue/src/popconfirm/src/pc.vue index 4cad7c45a..65eecbcb1 100644 --- a/packages/vue/src/popconfirm/src/pc.vue +++ b/packages/vue/src/popconfirm/src/pc.vue @@ -22,7 +22,7 @@ :class="['tiny-popconfirm-popover__icon', type ? `tiny-popconfirm-popover--${type}` : '']" > -