From b04a50e70ef3f6b4e5011a7ec35b4045ddb645b1 Mon Sep 17 00:00:00 2001 From: Gavin <19986739+wjw-gavin@users.noreply.github.com> Date: Sat, 14 Jan 2023 14:16:54 +0800 Subject: [PATCH] fix: change some colors to primary color (#11479) --- packages/vant/src/config-provider/README.md | 1 - packages/vant/src/config-provider/README.zh-CN.md | 1 - packages/vant/src/number-keyboard/README.md | 2 +- packages/vant/src/number-keyboard/README.zh-CN.md | 2 +- packages/vant/src/number-keyboard/index.less | 2 +- packages/vant/src/picker/README.md | 2 +- packages/vant/src/picker/README.zh-CN.md | 2 +- packages/vant/src/picker/index.less | 2 +- packages/vant/src/style/css-variables.less | 1 - 9 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/vant/src/config-provider/README.md b/packages/vant/src/config-provider/README.md index a8db34281..47bb156c2 100644 --- a/packages/vant/src/config-provider/README.md +++ b/packages/vant/src/config-provider/README.md @@ -262,7 +262,6 @@ There are all **Basic Variables** below, for component CSS Variables, please ref --van-text-color: var(--van-gray-8); --van-text-color-2: var(--van-gray-6); --van-text-color-3: var(--van-gray-5); ---van-link-color: #576b95; --van-active-color: var(--van-gray-2); --van-active-opacity: 0.6; --van-disabled-opacity: 0.5; diff --git a/packages/vant/src/config-provider/README.zh-CN.md b/packages/vant/src/config-provider/README.zh-CN.md index 9bf0d66cb..69f3620df 100644 --- a/packages/vant/src/config-provider/README.zh-CN.md +++ b/packages/vant/src/config-provider/README.zh-CN.md @@ -262,7 +262,6 @@ Vant 中的 CSS 变量分为 **基础变量** 和 **组件变量**。组件变 --van-text-color: var(--van-gray-8); --van-text-color-2: var(--van-gray-6); --van-text-color-3: var(--van-gray-5); ---van-link-color: #576b95; --van-active-color: var(--van-gray-2); --van-active-opacity: 0.6; --van-disabled-opacity: 0.5; diff --git a/packages/vant/src/number-keyboard/README.md b/packages/vant/src/number-keyboard/README.md index bf974879a..7638f7d35 100644 --- a/packages/vant/src/number-keyboard/README.md +++ b/packages/vant/src/number-keyboard/README.md @@ -231,7 +231,7 @@ The component provides the following CSS variables, which can be used to customi | --van-number-keyboard-title-height | _34px_ | - | | --van-number-keyboard-title-font-size | _var(--van-font-size-lg)_ | - | | --van-number-keyboard-close-padding | _0 var(--van-padding-md)_ | - | -| --van-number-keyboard-close-color | _var(--van-link-color)_ | - | +| --van-number-keyboard-close-color | _var(--van-primary-color)_ | - | | --van-number-keyboard-close-font-size | _var(--van-font-size-md)_ | - | | --van-number-keyboard-button-text-color | _var(--van-white)_ | - | | --van-number-keyboard-button-background | _var(--van-primary-color)_ | - | diff --git a/packages/vant/src/number-keyboard/README.zh-CN.md b/packages/vant/src/number-keyboard/README.zh-CN.md index 58a11299e..a1c89d1fe 100644 --- a/packages/vant/src/number-keyboard/README.zh-CN.md +++ b/packages/vant/src/number-keyboard/README.zh-CN.md @@ -238,7 +238,7 @@ import type { NumberKeyboardProps, NumberKeyboardTheme } from 'vant'; | --van-number-keyboard-title-height | _34px_ | - | | --van-number-keyboard-title-font-size | _var(--van-font-size-lg)_ | - | | --van-number-keyboard-close-padding | _0 var(--van-padding-md)_ | - | -| --van-number-keyboard-close-color | _var(--van-link-color)_ | - | +| --van-number-keyboard-close-color | _var(--van-primary-color)_ | - | | --van-number-keyboard-close-font-size | _var(--van-font-size-md)_ | - | | --van-number-keyboard-button-text-color | _var(--van-white)_ | - | | --van-number-keyboard-button-background | _var(--van-primary-color)_ | - | diff --git a/packages/vant/src/number-keyboard/index.less b/packages/vant/src/number-keyboard/index.less index 5035d7686..29d06c853 100644 --- a/packages/vant/src/number-keyboard/index.less +++ b/packages/vant/src/number-keyboard/index.less @@ -9,7 +9,7 @@ --van-number-keyboard-title-height: 34px; --van-number-keyboard-title-font-size: var(--van-font-size-lg); --van-number-keyboard-close-padding: 0 var(--van-padding-md); - --van-number-keyboard-close-color: var(--van-link-color); + --van-number-keyboard-close-color: var(--van-primary-color); --van-number-keyboard-close-font-size: var(--van-font-size-md); --van-number-keyboard-button-text-color: var(--van-white); --van-number-keyboard-button-background: var(--van-primary-color); diff --git a/packages/vant/src/picker/README.md b/packages/vant/src/picker/README.md index ac11e688f..a73525998 100644 --- a/packages/vant/src/picker/README.md +++ b/packages/vant/src/picker/README.md @@ -434,7 +434,7 @@ The component provides the following CSS variables, which can be used to customi | --van-picker-title-line-height | _var(--van-line-height-md)_ | - | | --van-picker-action-padding | _0 var(--van-padding-md)_ | - | | --van-picker-action-font-size | _var(--van-font-size-md)_ | - | -| --van-picker-confirm-action-color | _var(--van-link-color)_ | - | +| --van-picker-confirm-action-color | _var(--van-primary-color)_ | - | | --van-picker-cancel-action-color | _var(--van-text-color-2)_ | - | | --van-picker-option-padding | _0 var(--van-padding-base)_ | - | | --van-picker-option-font-size | _var(--van-font-size-lg)_ | - | diff --git a/packages/vant/src/picker/README.zh-CN.md b/packages/vant/src/picker/README.zh-CN.md index f5bbb506a..50befa5d0 100644 --- a/packages/vant/src/picker/README.zh-CN.md +++ b/packages/vant/src/picker/README.zh-CN.md @@ -455,7 +455,7 @@ pickerRef.value?.confirm(); | --van-picker-title-line-height | _var(--van-line-height-md)_ | - | | --van-picker-action-padding | _0 var(--van-padding-md)_ | - | | --van-picker-action-font-size | _var(--van-font-size-md)_ | - | -| --van-picker-confirm-action-color | _var(--van-link-color)_ | - | +| --van-picker-confirm-action-color | _var(--van-primary-color)_ | - | | --van-picker-cancel-action-color | _var(--van-text-color-2)_ | - | | --van-picker-option-padding | _0 var(--van-padding-base)_ | - | | --van-picker-option-font-size | _var(--van-font-size-lg)_ | - | diff --git a/packages/vant/src/picker/index.less b/packages/vant/src/picker/index.less index ec58a9b92..4499e56b2 100644 --- a/packages/vant/src/picker/index.less +++ b/packages/vant/src/picker/index.less @@ -5,7 +5,7 @@ --van-picker-title-line-height: var(--van-line-height-md); --van-picker-action-padding: 0 var(--van-padding-md); --van-picker-action-font-size: var(--van-font-size-md); - --van-picker-confirm-action-color: var(--van-link-color); + --van-picker-confirm-action-color: var(--van-primary-color); --van-picker-cancel-action-color: var(--van-text-color-2); --van-picker-option-font-size: var(--van-font-size-lg); --van-picker-option-padding: 0 var(--van-padding-base); diff --git a/packages/vant/src/style/css-variables.less b/packages/vant/src/style/css-variables.less index 417c9de70..2177c4a41 100644 --- a/packages/vant/src/style/css-variables.less +++ b/packages/vant/src/style/css-variables.less @@ -29,7 +29,6 @@ --van-text-color: var(--van-gray-8); --van-text-color-2: var(--van-gray-6); --van-text-color-3: var(--van-gray-5); - --van-link-color: #576b95; --van-active-color: var(--van-gray-2); --van-active-opacity: 0.6; --van-disabled-opacity: 0.5;