From 60486970bf99088a17f9bef6028a6a4c67c5fed1 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 1 Nov 2021 21:00:58 +0800 Subject: [PATCH] style(SubmitBar): adjust tip color (#9779) * style(SubmitBar): adjust tip color * chore: upd --- packages/vant/src/contact-card/index.less | 4 ++-- .../form/test/__snapshots__/demo.spec.ts.snap | 2 +- .../test/__snapshots__/demo.spec.ts.snap | 18 +++++++++--------- .../test/__snapshots__/index.spec.ts.snap | 2 +- packages/vant/src/submit-bar/README.md | 4 ++-- packages/vant/src/submit-bar/README.zh-CN.md | 8 ++++---- packages/vant/src/submit-bar/demo/index.vue | 4 ++-- packages/vant/src/submit-bar/var.less | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/vant/src/contact-card/index.less b/packages/vant/src/contact-card/index.less index da70f11b4..0af7e3344 100644 --- a/packages/vant/src/contact-card/index.less +++ b/packages/vant/src/contact-card/index.less @@ -34,8 +34,8 @@ height: 2px; background: repeating-linear-gradient( -45deg, - #ff6c6c 0, - #ff6c6c 20%, + var(--van-warning-color) 0, + var(--van-warning-color) 20%, transparent 0, transparent 25%, var(--van-primary-color) 0, diff --git a/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap index b7ac64b24..a69116e00 100644 --- a/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap +++ b/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap @@ -285,7 +285,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > diff --git a/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap index 503ddbdf3..b82a7af22 100644 --- a/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap +++ b/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap @@ -23,7 +23,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -50,7 +50,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -77,7 +77,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="5" > @@ -104,7 +104,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -160,7 +160,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -187,7 +187,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -217,7 +217,7 @@ exports[`should render demo and match snapshot 1`] = ` > @@ -244,7 +244,7 @@ exports[`should render demo and match snapshot 1`] = ` aria-valuenow="1" > @@ -275,7 +275,7 @@ exports[`should render demo and match snapshot 1`] = ` > diff --git a/packages/vant/src/stepper/test/__snapshots__/index.spec.ts.snap b/packages/vant/src/stepper/test/__snapshots__/index.spec.ts.snap index f3d38fd37..e0aa7c716 100644 --- a/packages/vant/src/stepper/test/__snapshots__/index.spec.ts.snap +++ b/packages/vant/src/stepper/test/__snapshots__/index.spec.ts.snap @@ -40,7 +40,7 @@ exports[`should update input height and button size when using button-size prop > diff --git a/packages/vant/src/submit-bar/README.md b/packages/vant/src/submit-bar/README.md index c48f976ee..9bab937bf 100644 --- a/packages/vant/src/submit-bar/README.md +++ b/packages/vant/src/submit-bar/README.md @@ -151,8 +151,8 @@ The component provides the following CSS variables, which can be used to customi | --van-submit-bar-tip-padding | _var(--van-padding-xs) var(--van-padding-sm)_ | - | | --van-submit-bar-tip-font-size | _var(--van-font-size-sm)_ | - | | --van-submit-bar-tip-line-height | _1.5_ | - | -| --van-submit-bar-tip-color | _#f56723_ | - | -| --van-submit-bar-tip-background-color | _#fff7cc_ | - | +| --van-submit-bar-tip-color | _var(--van-orange-dark)_ | - | +| --van-submit-bar-tip-background-color | _var(--van-orange-light)_ | - | | --van-submit-bar-tip-icon-size | _12px_ | - | | --van-submit-bar-button-height | _40px_ | - | | --van-submit-bar-padding | _0 var(--van-padding-md)_ | - | diff --git a/packages/vant/src/submit-bar/README.zh-CN.md b/packages/vant/src/submit-bar/README.zh-CN.md index c0e0a890c..6a7d6ad95 100644 --- a/packages/vant/src/submit-bar/README.zh-CN.md +++ b/packages/vant/src/submit-bar/README.zh-CN.md @@ -46,7 +46,7 @@ export default { disabled :price="3050" button-text="提交订单" - tip="你的收货地址不支持同城送, 我们已为你推荐快递" + tip="你的收货地址不支持配送" tip-icon="info-o" @submit="onSubmit" /> @@ -73,7 +73,7 @@ export default { 全选 ``` @@ -158,8 +158,8 @@ import type { SubmitBarProps } from 'vant'; | --van-submit-bar-tip-padding | _var(--van-padding-xs) var(--van-padding-sm)_ | - | | --van-submit-bar-tip-font-size | _var(--van-font-size-sm)_ | - | | --van-submit-bar-tip-line-height | _1.5_ | - | -| --van-submit-bar-tip-color | _#f56723_ | - | -| --van-submit-bar-tip-background-color | _#fff7cc_ | - | +| --van-submit-bar-tip-color | _var(--van-orange-dark)_ | - | +| --van-submit-bar-tip-background-color | _var(--van-orange-light)_ | - | | --van-submit-bar-tip-icon-size | _12px_ | - | | --van-submit-bar-button-height | _40px_ | - | | --van-submit-bar-padding | _0 var(--van-padding-md)_ | - | diff --git a/packages/vant/src/submit-bar/demo/index.vue b/packages/vant/src/submit-bar/demo/index.vue index 8866af83c..c28f743de 100644 --- a/packages/vant/src/submit-bar/demo/index.vue +++ b/packages/vant/src/submit-bar/demo/index.vue @@ -7,8 +7,8 @@ import { Toast } from '../../toast'; const t = useTranslate({ 'zh-CN': { - tip1: '你的收货地址不支持同城送, 我们已为你推荐快递', - tip2: '你的收货地址不支持同城送, ', + tip1: '你的收货地址不支持配送', + tip2: '你的收货地址不支持配送, ', tip3: '修改地址', check: '全选', submit: '提交订单', diff --git a/packages/vant/src/submit-bar/var.less b/packages/vant/src/submit-bar/var.less index 0b8767d53..7c5220261 100644 --- a/packages/vant/src/submit-bar/var.less +++ b/packages/vant/src/submit-bar/var.less @@ -12,8 +12,8 @@ @submit-bar-tip-padding: var(--van-padding-xs) var(--van-padding-sm); @submit-bar-tip-font-size: var(--van-font-size-sm); @submit-bar-tip-line-height: 1.5; -@submit-bar-tip-color: #f56723; -@submit-bar-tip-background-color: #fff7cc; +@submit-bar-tip-color: var(--van-orange-dark); +@submit-bar-tip-background-color: var(--van-orange-light); @submit-bar-tip-icon-size: 12px; @submit-bar-button-height: 40px; @submit-bar-padding: 0 var(--van-padding-md);