diff --git a/packages/vant/docs/markdown/changelog-v4.zh-CN.md b/packages/vant/docs/markdown/changelog-v4.zh-CN.md index 1a970cbb9..17e7a7e83 100644 --- a/packages/vant/docs/markdown/changelog-v4.zh-CN.md +++ b/packages/vant/docs/markdown/changelog-v4.zh-CN.md @@ -16,10 +16,11 @@ - DropdownMenu - IndexBar - Sidebar +- Steps - Tabs 其他: - Button: 默认圆角大小从 `2px` 调整为 `4px` -- Button: 默认按钮的边框颜色调整为 `--van-gray-6` +- Button: 默认按钮的边框颜色调整为 `--van-gray-4` - Button: 调整 font-smoothing,默认使用粗体文字 diff --git a/packages/vant/src/button/README.md b/packages/vant/src/button/README.md index 2dfa99e7c..91174bd40 100644 --- a/packages/vant/src/button/README.md +++ b/packages/vant/src/button/README.md @@ -185,7 +185,7 @@ The component provides the following CSS variables, which can be used to customi | --van-button-default-font-size | _var(--van-font-size-lg)_ | - | | --van-button-default-color | _var(--van-text-color)_ | - | | --van-button-default-background | _var(--van-background-light)_ | - | -| --van-button-default-border-color | _var(--van-gray-6)_ | - | +| --van-button-default-border-color | _var(--van-gray-4)_ | - | | --van-button-primary-color | _var(--van-white)_ | - | | --van-button-primary-background | _var(--van-primary-color)_ | - | | --van-button-primary-border-color | _var(--van-primary-color)_ | - | diff --git a/packages/vant/src/button/README.zh-CN.md b/packages/vant/src/button/README.zh-CN.md index 44905edaa..700833bc9 100644 --- a/packages/vant/src/button/README.zh-CN.md +++ b/packages/vant/src/button/README.zh-CN.md @@ -208,7 +208,7 @@ import type { | --van-button-default-font-size | _var(--van-font-size-lg)_ | - | | --van-button-default-color | _var(--van-text-color)_ | - | | --van-button-default-background | _var(--van-background-light)_ | - | -| --van-button-default-border-color | _var(--van-gray-6)_ | - | +| --van-button-default-border-color | _var(--van-gray-4)_ | - | | --van-button-primary-color | _var(--van-white)_ | - | | --van-button-primary-background | _var(--van-primary-color)_ | - | | --van-button-primary-border-color | _var(--van-primary-color)_ | - | diff --git a/packages/vant/src/button/index.less b/packages/vant/src/button/index.less index 9316d3b3e..52f3e4d45 100644 --- a/packages/vant/src/button/index.less +++ b/packages/vant/src/button/index.less @@ -13,7 +13,7 @@ --van-button-default-font-size: var(--van-font-size-lg); --van-button-default-color: var(--van-text-color); --van-button-default-background: var(--van-background-light); - --van-button-default-border-color: var(--van-gray-6); + --van-button-default-border-color: var(--van-gray-4); --van-button-primary-color: var(--van-white); --van-button-primary-background: var(--van-primary-color); --van-button-primary-border-color: var(--van-primary-color); diff --git a/packages/vant/src/step/index.less b/packages/vant/src/step/index.less index e929ff8c3..b049619ad 100644 --- a/packages/vant/src/step/index.less +++ b/packages/vant/src/step/index.less @@ -1,10 +1,10 @@ :root { --van-step-text-color: var(--van-text-color-2); - --van-step-active-color: var(--van-success-color); + --van-step-active-color: var(--van-primary-color); --van-step-process-text-color: var(--van-text-color); --van-step-font-size: var(--van-font-size-md); --van-step-line-color: var(--van-border-color); - --van-step-finish-line-color: var(--van-success-color); + --van-step-finish-line-color: var(--van-primary-color); --van-step-finish-text-color: var(--van-text-color); --van-step-icon-size: 12px; --van-step-circle-size: 5px; diff --git a/packages/vant/src/steps/README.md b/packages/vant/src/steps/README.md index 5b4005c66..78826cb0f 100644 --- a/packages/vant/src/steps/README.md +++ b/packages/vant/src/steps/README.md @@ -44,7 +44,7 @@ export default { ### Custom Style ```html - + Step1 Step2 Step3 @@ -118,11 +118,11 @@ The component provides the following CSS variables, which can be used to customi | Name | Default Value | Description | | --- | --- | --- | | --van-step-text-color | _var(--van-text-color-2)_ | - | -| --van-step-active-color | _var(--van-success-color)_ | - | +| --van-step-active-color | _var(--van-primary-color)_ | - | | --van-step-process-text-color | _var(--van-text-color)_ | - | | --van-step-font-size | _var(--van-font-size-md)_ | - | | --van-step-line-color | _var(--van-border-color)_ | - | -| --van-step-finish-line-color | _var(--van-success-color)_ | - | +| --van-step-finish-line-color | _var(--van-primary-color)_ | - | | --van-step-finish-text-color | _var(--van-text-color)_ | - | | --van-step-icon-size | _12px_ | - | | --van-step-circle-size | _5px_ | - | diff --git a/packages/vant/src/steps/README.zh-CN.md b/packages/vant/src/steps/README.zh-CN.md index 662690151..ac6733b98 100644 --- a/packages/vant/src/steps/README.zh-CN.md +++ b/packages/vant/src/steps/README.zh-CN.md @@ -48,7 +48,7 @@ export default { 可以通过 `active-icon` 和 `active-color` 属性设置激活状态下的图标和颜色。 ```html - + 买家下单 商家接单 买家提货 @@ -124,11 +124,11 @@ import type { StepsProps, StepsDirection } from 'vant'; | 名称 | 默认值 | 描述 | | ------------------------------------- | ----------------------------- | ---- | | --van-step-text-color | _var(--van-text-color-2)_ | - | -| --van-step-active-color | _var(--van-success-color)_ | - | +| --van-step-active-color | _var(--van-primary-color)_ | - | | --van-step-process-text-color | _var(--van-text-color)_ | - | | --van-step-font-size | _var(--van-font-size-md)_ | - | | --van-step-line-color | _var(--van-border-color)_ | - | -| --van-step-finish-line-color | _var(--van-success-color)_ | - | +| --van-step-finish-line-color | _var(--van-primary-color)_ | - | | --van-step-finish-text-color | _var(--van-text-color)_ | - | | --van-step-icon-size | _12px_ | - | | --van-step-circle-size | _5px_ | - | diff --git a/packages/vant/src/steps/demo/index.vue b/packages/vant/src/steps/demo/index.vue index 3f30a939d..7d7483c2b 100644 --- a/packages/vant/src/steps/demo/index.vue +++ b/packages/vant/src/steps/demo/index.vue @@ -58,7 +58,7 @@ const nextStep = () => { :active="active" active-icon="success" inactive-icon="arrow" - active-color="#38f" + active-color="#07c160" > {{ t('step1') }} {{ t('step2') }} @@ -87,24 +87,14 @@ const nextStep = () => {