diff --git a/src/locale/en-US.json b/src/locale/en-US.json index 4c9a08b3..6838ee8c 100644 --- a/src/locale/en-US.json +++ b/src/locale/en-US.json @@ -702,7 +702,7 @@ "ju-jue": "refuse", "ju-ming-cha-cao-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi": "Named slot: This is a simple example text. This is a simple example text. This is a simple example text. This is a simple example text. This is a simple example text. This is a simple example text. This is a simple example text. This is a simple example text.", "ju-xing-ka-pian": "Rectangular card", - "ju-zhong-toast": "Mid game toast", + "ju-zhong-toast": "Center toast", "juanZeng": "donate", "ka-pi-ba-la": "Card! Pi! Ba! PULL!", "ka-pian-yang-shi": "Card style", diff --git a/src/locale/zh-CN.json b/src/locale/zh-CN.json index 1a1ecec4..145d577d 100644 --- a/src/locale/zh-CN.json +++ b/src/locale/zh-CN.json @@ -702,7 +702,7 @@ "ju-jue": "拒绝", "ju-ming-cha-cao-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi-zhe-shi-yi-tiao-jian-dan-de-shi-li-wen-zi": "具名插槽:这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。这是一条简单的示例文字。", "ju-xing-ka-pian": "矩形卡片", - "ju-zhong-toast": "局中toast", + "ju-zhong-toast": "居中toast", "juanZeng": "捐赠", "ka-pi-ba-la": "卡!皮!巴!拉!", "ka-pian-yang-shi": "卡片样式", diff --git a/src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss b/src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss index 2e98cd40..d877d7c5 100644 --- a/src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss +++ b/src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss @@ -639,16 +639,19 @@ $-tag-close-color: var(--wot-tag-close-color, $-tag-info-color) !default; // 关 $-tag-close-active-color: var(--wot-tag-close-active-color, rgba(0, 0, 0, 0.45)) !default; // 关闭按钮 active 颜色 /* toast */ +$-toast-color: var(--wot-toast-color, $-color-white) !default; // 文字颜色 $-toast-padding: var(--wot-toast-padding, 16px 24px) !default; // padding $-toast-max-width: var(--wot-toast-max-width, 300px) !default; // 最大宽度 $-toast-radius: var(--wot-toast-radius, 8px) !default; // 圆角大小 $-toast-bg: var(--wot-toast-bg, $-overlay-bg) !default; // 背景色 $-toast-fs: var(--wot-toast-fs, $-fs-content) !default; // 字号 +$-toast-line-height: var(--wot-toast-line-height, 20px) !default; // 行高 $-toast-with-icon-min-width: var(--wot-toast-with-icon-min-width, 150px) !default; // 有图标的情况下最小宽度 $-toast-icon-size: var(--wot-toast-icon-size, 32px) !default; // 图标大小 $-toast-icon-margin-right: var(--wot-toast-icon-margin-right, 12px) !default; // 图标右边距 $-toast-icon-margin-bottom: var(--wot-toast-icon-margin-bottom, 12px) !default; // 图标下边距 -$-toast-loading-padding: var(--wot-toast-loading-padding, 10px) !default; // loading 下的padding +$-toast-loading-padding: var(--wot-toast-loading-padding, 10px) !default; // loading状态下的padding +$-toast-loading-margin-bottom: var(--wot-toast-loading-margin-bottom, 16px) !default; // loading动画的margin-bottom $-toast-box-shadow: var(--wot-toast-box-shadow, 0px 6px 16px 0px rgba(0, 0, 0, 0.08)) !default; // 外部阴影 /* loading */ diff --git a/src/uni_modules/wot-design-uni/components/wd-toast/index.scss b/src/uni_modules/wot-design-uni/components/wd-toast/index.scss index fe1c8bca..8d225bc4 100644 --- a/src/uni_modules/wot-design-uni/components/wd-toast/index.scss +++ b/src/uni_modules/wot-design-uni/components/wd-toast/index.scss @@ -7,7 +7,7 @@ padding: $-toast-padding; background-color: $-toast-bg; border-radius: $-toast-radius; - color: #fff; + color: $-toast-color; transition: all 0.2s; font-size: $-toast-fs; box-sizing: border-box; @@ -19,7 +19,8 @@ @include e(msg) { font-size: $-toast-fs; - line-height: 20px; + word-break: break-all; + line-height: $-toast-line-height; text-align: left; font-family: "San Francisco", Rotobo, arial, "PingFang SC", "Noto SansCJK", "Microsoft Yahei", sans-serif; } @@ -50,7 +51,7 @@ background-repeat: no-repeat; } @include e(loading) { - margin-bottom: 16px; + margin-bottom: $-toast-loading-margin-bottom; display: inline-block; } @include m(top) {