From 3b10d66bb92869d03b7af8228bfd1b1e0361a033 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Mon, 24 Jan 2022 15:19:46 +0800 Subject: [PATCH] style(Tabs): using primary color by default --- packages/vant/docs/markdown/changelog.zh-CN-v4.md | 12 ++++++++++++ packages/vant/src/count-down/demo/index.vue | 6 +++--- packages/vant/src/tab/README.md | 6 +++--- packages/vant/src/tab/README.zh-CN.md | 6 +++--- packages/vant/src/tabs/index.less | 4 ++-- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/vant/docs/markdown/changelog.zh-CN-v4.md b/packages/vant/docs/markdown/changelog.zh-CN-v4.md index 79c4bb471..71785717e 100644 --- a/packages/vant/docs/markdown/changelog.zh-CN-v4.md +++ b/packages/vant/docs/markdown/changelog.zh-CN-v4.md @@ -8,4 +8,16 @@ **Style** +以下组件的默认色值调整为 `--van-primary-color`： + +- Calendar +- Cascader +- Dialog +- DropdownMenu +- IndexBar +- Sidebar +- Tabs + +其他： + - Button: 默认圆角大小从 `2px` 调整为 `4px` diff --git a/packages/vant/src/count-down/demo/index.vue b/packages/vant/src/count-down/demo/index.vue index 7625d1768..165afa1bd 100644 --- a/packages/vant/src/count-down/demo/index.vue +++ b/packages/vant/src/count-down/demo/index.vue @@ -5,7 +5,7 @@ import VanGridItem from '../../grid-item'; import { ref } from 'vue'; import { useTranslate } from '../../../docs/site/use-translate'; import { Toast } from '../../toast'; -import type { CountDownInstance } from '../CountDown'; +import type { CountDownInstance } from '..'; const t = useTranslate({ 'zh-CN': { @@ -100,7 +100,7 @@ const onFinish = () => Toast(t('finished')); .colon { display: inline-block; margin: 0 4px; - color: var(--van-red); + color: var(--van-primary-color); } .block { @@ -109,7 +109,7 @@ const onFinish = () => Toast(t('finished')); color: #fff; font-size: 12px; text-align: center; - background-color: var(--van-red); + background-color: var(--van-primary-color); border-radius: 4px; } diff --git a/packages/vant/src/tab/README.md b/packages/vant/src/tab/README.md index 88eee1d1f..73cc641c5 100644 --- a/packages/vant/src/tab/README.md +++ b/packages/vant/src/tab/README.md @@ -239,7 +239,7 @@ export default { | --- | --- | --- | --- | | v-model:active | Index of active tab | _number \| string_ | `0` | | type | Can be set to `line` `card` | _string_ | `line` | -| color | Tab color | _string_ | `#ee0a24` | +| color | Tab color | _string_ | `#1989fa` | | background | Background color | _string_ | `white` | | duration | Toggle tab's animation time | _number \| string_ | `0.3` | | line-width | Width of tab line | _number \| string_ | `40px` | @@ -339,10 +339,10 @@ The component provides the following CSS variables, which can be used to customi | --van-tab-disabled-text-color | _var(--van-text-color-3)_ | - | | --van-tab-font-size | _var(--van-font-size-md)_ | - | | --van-tab-line-height | _var(--van-line-height-md)_ | - | -| --van-tabs-default-color | _var(--van-danger-color)_ | - | +| --van-tabs-default-color | _var(--van-primary-color)_ | - | | --van-tabs-line-height | _44px_ | - | | --van-tabs-card-height | _30px_ | - | | --van-tabs-nav-background | _var(--van-background-light)_ | - | | --van-tabs-bottom-bar-width | _40px_ | - | | --van-tabs-bottom-bar-height | _3px_ | - | -| --van-tabs-bottom-bar-color | _var(--van-danger-color)_ | - | +| --van-tabs-bottom-bar-color | _var(--van-primary-color)_ | - | diff --git a/packages/vant/src/tab/README.zh-CN.md b/packages/vant/src/tab/README.zh-CN.md index 7b498b2d1..51633121c 100644 --- a/packages/vant/src/tab/README.zh-CN.md +++ b/packages/vant/src/tab/README.zh-CN.md @@ -252,7 +252,7 @@ export default { | --- | --- | --- | --- | | v-model:active | 绑定当前选中标签的标识符 | _number \| string_ | `0` | | type | 样式风格类型，可选值为 `card` | _string_ | `line` | -| color | 标签主题色 | _string_ | `#ee0a24` | +| color | 标签主题色 | _string_ | `#1989fa` | | background | 标签栏背景色 | _string_ | `white` | | duration | 动画时间，单位秒，设置为 0 可以禁用动画 | _number \| string_ | `0.3` | | line-width | 底部条宽度，默认单位 `px` | _number \| string_ | `40px` | @@ -354,13 +354,13 @@ tabsRef.value?.scrollTo(0); | --van-tab-disabled-text-color | _var(--van-text-color-3)_ | - | | --van-tab-font-size | _var(--van-font-size-md)_ | - | | --van-tab-line-height | _var(--van-line-height-md)_ | - | -| --van-tabs-default-color | _var(--van-danger-color)_ | - | +| --van-tabs-default-color | _var(--van-primary-color)_ | - | | --van-tabs-line-height | _44px_ | - | | --van-tabs-card-height | _30px_ | - | | --van-tabs-nav-background | _var(--van-background-light)_ | - | | --van-tabs-bottom-bar-width | _40px_ | - | | --van-tabs-bottom-bar-height | _3px_ | - | -| --van-tabs-bottom-bar-color | _var(--van-danger-color)_ | - | +| --van-tabs-bottom-bar-color | _var(--van-primary-color)_ | - | ## 常见问题 diff --git a/packages/vant/src/tabs/index.less b/packages/vant/src/tabs/index.less index 80e481cf6..3c43be7e6 100644 --- a/packages/vant/src/tabs/index.less +++ b/packages/vant/src/tabs/index.less @@ -4,13 +4,13 @@ --van-tab-disabled-text-color: var(--van-text-color-3); --van-tab-font-size: var(--van-font-size-md); --van-tab-line-height: var(--van-line-height-md); - --van-tabs-default-color: var(--van-danger-color); + --van-tabs-default-color: var(--van-primary-color); --van-tabs-line-height: 44px; --van-tabs-card-height: 30px; --van-tabs-nav-background: var(--van-background-light); --van-tabs-bottom-bar-width: 40px; --van-tabs-bottom-bar-height: 3px; - --van-tabs-bottom-bar-color: var(--van-danger-color); + --van-tabs-bottom-bar-color: var(--van-primary-color); } .van-tab {