From 98b999d911c41ac1a73e6ef375b4966befe69b20 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 27 Jan 2022 10:35:57 +0800 Subject: [PATCH] refactor: rename --van-background-light to --van-background-2 --- packages/vant-cli/site/mobile/App.vue | 2 +- .../docs/markdown/migrate-from-v3.zh-CN.md | 1 + packages/vant/src/action-bar-icon/index.less | 2 +- packages/vant/src/action-bar/README.md | 4 +-- packages/vant/src/action-bar/README.zh-CN.md | 30 ++++++++-------- packages/vant/src/action-bar/index.less | 2 +- packages/vant/src/action-sheet/README.md | 2 +- .../vant/src/action-sheet/README.zh-CN.md | 2 +- packages/vant/src/action-sheet/index.less | 2 +- packages/vant/src/address-list/index.less | 4 +-- packages/vant/src/badge/demo/index.vue | 2 +- packages/vant/src/badge/index.less | 2 +- packages/vant/src/button/README.md | 2 +- packages/vant/src/button/README.zh-CN.md | 2 +- packages/vant/src/button/demo/index.vue | 2 +- packages/vant/src/button/index.less | 2 +- packages/vant/src/calendar/README.md | 2 +- packages/vant/src/calendar/README.zh-CN.md | 2 +- packages/vant/src/calendar/index.less | 2 +- packages/vant/src/card/demo/index.vue | 2 +- packages/vant/src/cell-group/index.less | 2 +- packages/vant/src/cell/README.md | 4 +-- packages/vant/src/cell/README.zh-CN.md | 4 +-- packages/vant/src/cell/index.less | 2 +- packages/vant/src/col/demo/index.vue | 2 +- packages/vant/src/collapse-item/index.less | 2 +- packages/vant/src/collapse/README.md | 2 +- packages/vant/src/collapse/README.zh-CN.md | 2 +- packages/vant/src/config-provider/README.md | 2 +- .../vant/src/config-provider/README.zh-CN.md | 2 +- packages/vant/src/contact-list/index.less | 2 +- packages/vant/src/count-down/demo/index.vue | 2 +- packages/vant/src/coupon-list/README.md | 2 +- packages/vant/src/coupon-list/README.zh-CN.md | 2 +- packages/vant/src/coupon-list/index.less | 4 +-- packages/vant/src/coupon/index.less | 2 +- packages/vant/src/dialog/README.md | 2 +- packages/vant/src/dialog/README.zh-CN.md | 2 +- packages/vant/src/dialog/index.less | 2 +- packages/vant/src/divider/demo/index.vue | 2 +- packages/vant/src/dropdown-menu/README.md | 2 +- .../vant/src/dropdown-menu/README.zh-CN.md | 2 +- packages/vant/src/dropdown-menu/index.less | 2 +- packages/vant/src/empty/demo/index.vue | 2 +- packages/vant/src/grid-item/index.less | 2 +- packages/vant/src/grid/README.md | 2 +- packages/vant/src/grid/README.zh-CN.md | 2 +- packages/vant/src/icon/demo/index.vue | 2 +- packages/vant/src/image/demo/index.vue | 2 +- packages/vant/src/index-anchor/index.less | 2 +- packages/vant/src/index-bar/README.md | 2 +- packages/vant/src/index-bar/README.zh-CN.md | 30 ++++++++-------- packages/vant/src/loading/demo/index.vue | 2 +- packages/vant/src/nav-bar/README.md | 20 +++++------ packages/vant/src/nav-bar/README.zh-CN.md | 20 +++++------ packages/vant/src/nav-bar/index.less | 2 +- packages/vant/src/notice-bar/demo/index.vue | 2 +- packages/vant/src/number-keyboard/index.less | 2 +- packages/vant/src/overlay/demo/index.vue | 4 +-- packages/vant/src/pagination/README.md | 2 +- packages/vant/src/pagination/README.zh-CN.md | 2 +- packages/vant/src/pagination/index.less | 2 +- packages/vant/src/password-input/README.md | 2 +- .../vant/src/password-input/README.zh-CN.md | 34 +++++++++---------- packages/vant/src/password-input/index.less | 2 +- packages/vant/src/picker/README.md | 2 +- packages/vant/src/picker/README.zh-CN.md | 34 +++++++++---------- packages/vant/src/picker/index.less | 2 +- packages/vant/src/popover/README.md | 2 +- packages/vant/src/popover/README.zh-CN.md | 2 +- packages/vant/src/popover/index.less | 2 +- packages/vant/src/popup/README.md | 2 +- packages/vant/src/popup/README.zh-CN.md | 2 +- packages/vant/src/popup/index.less | 2 +- packages/vant/src/progress/demo/index.vue | 2 +- packages/vant/src/pull-refresh/demo/index.vue | 2 +- packages/vant/src/rate/demo/index.vue | 2 +- packages/vant/src/search/README.md | 26 +++++++------- packages/vant/src/search/README.zh-CN.md | 26 +++++++------- packages/vant/src/search/index.less | 2 +- packages/vant/src/share-sheet/README.md | 2 +- packages/vant/src/share-sheet/README.zh-CN.md | 2 +- packages/vant/src/share-sheet/index.less | 2 +- packages/vant/src/sidebar-item/index.less | 2 +- packages/vant/src/sidebar/README.md | 2 +- packages/vant/src/sidebar/README.zh-CN.md | 32 ++++++++--------- packages/vant/src/sidebar/demo/index.vue | 2 +- packages/vant/src/skeleton/demo/index.vue | 2 +- packages/vant/src/slider/demo/index.vue | 2 +- packages/vant/src/step/index.less | 2 +- packages/vant/src/stepper/index.less | 2 +- packages/vant/src/steps/README.md | 2 +- packages/vant/src/steps/README.zh-CN.md | 28 +++++++-------- packages/vant/src/steps/index.less | 2 +- packages/vant/src/sticky/demo/index.vue | 2 +- packages/vant/src/style/css-variables.less | 10 +++--- packages/vant/src/style/demo/index.vue | 2 +- packages/vant/src/submit-bar/README.md | 2 +- packages/vant/src/submit-bar/README.zh-CN.md | 2 +- packages/vant/src/submit-bar/index.less | 2 +- packages/vant/src/swipe-cell/demo/index.vue | 2 +- packages/vant/src/switch/README.md | 2 +- packages/vant/src/switch/README.zh-CN.md | 2 +- packages/vant/src/switch/index.less | 2 +- packages/vant/src/tab/README.md | 28 +++++++-------- packages/vant/src/tab/README.zh-CN.md | 28 +++++++-------- packages/vant/src/tab/demo/index.vue | 2 +- packages/vant/src/tabbar-item/index.less | 2 +- packages/vant/src/tabbar/README.md | 4 +-- packages/vant/src/tabbar/README.zh-CN.md | 24 ++++++------- packages/vant/src/tabbar/index.less | 2 +- packages/vant/src/tabs/index.less | 2 +- packages/vant/src/tag/README.md | 2 +- packages/vant/src/tag/README.zh-CN.md | 2 +- packages/vant/src/tag/index.less | 2 +- packages/vant/src/tree-select/README.md | 2 +- packages/vant/src/tree-select/README.zh-CN.md | 20 +++++------ packages/vant/src/tree-select/index.less | 2 +- packages/vant/src/uploader/demo/index.vue | 2 +- 119 files changed, 307 insertions(+), 304 deletions(-) diff --git a/packages/vant-cli/site/mobile/App.vue b/packages/vant-cli/site/mobile/App.vue index 5293487b8..84fa98292 100644 --- a/packages/vant-cli/site/mobile/App.vue +++ b/packages/vant-cli/site/mobile/App.vue @@ -46,7 +46,7 @@ body { } .van-doc-theme-dark { - background-color: var(--van-doc-black); + background-color: #000; } ::-webkit-scrollbar { diff --git a/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md b/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md index f36489e60..68ab4ce5e 100644 --- a/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md +++ b/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md @@ -67,6 +67,7 @@ animation-duration -> duration animation-timing-function-enter -> ease-out animation-timing-function-leave -> ease-in background-color -> background +background-color-light -> background-2 border-radius -> radius border-width-base -> border-width box-shadow -> shadow diff --git a/packages/vant/src/action-bar-icon/index.less b/packages/vant/src/action-bar-icon/index.less index 809efdc39..a652fc1ba 100644 --- a/packages/vant/src/action-bar-icon/index.less +++ b/packages/vant/src/action-bar-icon/index.less @@ -6,7 +6,7 @@ body { --van-action-bar-icon-font-size: var(--van-font-size-xs); --van-action-bar-icon-active-color: var(--van-active-color); --van-action-bar-icon-text-color: var(--van-gray-7); - --van-action-bar-icon-background: var(--van-background-light); + --van-action-bar-icon-background: var(--van-background-2); } .van-action-bar-icon { diff --git a/packages/vant/src/action-bar/README.md b/packages/vant/src/action-bar/README.md index 4f78bfe0c..0dc35ca68 100644 --- a/packages/vant/src/action-bar/README.md +++ b/packages/vant/src/action-bar/README.md @@ -154,7 +154,7 @@ The component provides the following CSS variables, which can be used to customi | Name | Default Value | Description | | --- | --- | --- | -| --van-action-bar-background | _var(--van-background-light)_ | - | +| --van-action-bar-background | _var(--van-background-2)_ | - | | --van-action-bar-height | _50px_ | - | | --van-action-bar-icon-width | _48px_ | - | | --van-action-bar-icon-height | _100%_ | - | @@ -163,7 +163,7 @@ The component provides the following CSS variables, which can be used to customi | --van-action-bar-icon-font-size | _var(--van-font-size-xs)_ | - | | --van-action-bar-icon-active-color | _var(--van-active-color)_ | - | | --van-action-bar-icon-text-color | _var(--van-gray-7)_ | - | -| --van-action-bar-icon-background | _var(--van-background-light)_ | - | +| --van-action-bar-icon-background | _var(--van-background-2)_ | - | | --van-action-bar-button-height | _40px_ | - | | --van-action-bar-button-warning-color | _var(--van-gradient-orange)_ | - | | --van-action-bar-button-danger-color | _var(--van-gradient-red)_ | - | diff --git a/packages/vant/src/action-bar/README.zh-CN.md b/packages/vant/src/action-bar/README.zh-CN.md index e7123fa1b..7f416a29d 100644 --- a/packages/vant/src/action-bar/README.zh-CN.md +++ b/packages/vant/src/action-bar/README.zh-CN.md @@ -156,18 +156,18 @@ import type { 组件提供了下列 CSS 变量,可用于自定义样式,使用方法请参考 [ConfigProvider 组件](#/zh-CN/config-provider)。 -| 名称 | 默认值 | 描述 | -| ------------------------------------- | ----------------------------- | ---- | -| --van-action-bar-background | _var(--van-background-light)_ | - | -| --van-action-bar-height | _50px_ | - | -| --van-action-bar-icon-width | _48px_ | - | -| --van-action-bar-icon-height | _100%_ | - | -| --van-action-bar-icon-color | _var(--van-text-color)_ | - | -| --van-action-bar-icon-size | _18px_ | - | -| --van-action-bar-icon-font-size | _var(--van-font-size-xs)_ | - | -| --van-action-bar-icon-active-color | _var(--van-active-color)_ | - | -| --van-action-bar-icon-text-color | _var(--van-gray-7)_ | - | -| --van-action-bar-icon-background | _var(--van-background-light)_ | - | -| --van-action-bar-button-height | _40px_ | - | -| --van-action-bar-button-warning-color | _var(--van-gradient-orange)_ | - | -| --van-action-bar-button-danger-color | _var(--van-gradient-red)_ | - | +| 名称 | 默认值 | 描述 | +| ------------------------------------- | ---------------------------- | ---- | +| --van-action-bar-background | _var(--van-background-2)_ | - | +| --van-action-bar-height | _50px_ | - | +| --van-action-bar-icon-width | _48px_ | - | +| --van-action-bar-icon-height | _100%_ | - | +| --van-action-bar-icon-color | _var(--van-text-color)_ | - | +| --van-action-bar-icon-size | _18px_ | - | +| --van-action-bar-icon-font-size | _var(--van-font-size-xs)_ | - | +| --van-action-bar-icon-active-color | _var(--van-active-color)_ | - | +| --van-action-bar-icon-text-color | _var(--van-gray-7)_ | - | +| --van-action-bar-icon-background | _var(--van-background-2)_ | - | +| --van-action-bar-button-height | _40px_ | - | +| --van-action-bar-button-warning-color | _var(--van-gradient-orange)_ | - | +| --van-action-bar-button-danger-color | _var(--van-gradient-red)_ | - | diff --git a/packages/vant/src/action-bar/index.less b/packages/vant/src/action-bar/index.less index 86c3feced..ffbb4c462 100644 --- a/packages/vant/src/action-bar/index.less +++ b/packages/vant/src/action-bar/index.less @@ -1,5 +1,5 @@ body { - --van-action-bar-background: var(--van-background-light); + --van-action-bar-background: var(--van-background-2); --van-action-bar-height: 50px; } diff --git a/packages/vant/src/action-sheet/README.md b/packages/vant/src/action-sheet/README.md index 4cc1a07eb..f8b9a9a90 100644 --- a/packages/vant/src/action-sheet/README.md +++ b/packages/vant/src/action-sheet/README.md @@ -247,7 +247,7 @@ The component provides the following CSS variables, which can be used to customi | --van-action-sheet-description-color | _var(--van-text-color-2)_ | - | | --van-action-sheet-description-font-size | _var(--van-font-size-md)_ | - | | --van-action-sheet-description-line-height | _var(--van-line-height-md)_ | - | -| --van-action-sheet-item-background | _var(--van-background-light)_ | - | +| --van-action-sheet-item-background | _var(--van-background-2)_ | - | | --van-action-sheet-item-font-size | _var(--van-font-size-lg)_ | - | | --van-action-sheet-item-line-height | _var(--van-line-height-lg)_ | - | | --van-action-sheet-item-text-color | _var(--van-text-color)_ | - | diff --git a/packages/vant/src/action-sheet/README.zh-CN.md b/packages/vant/src/action-sheet/README.zh-CN.md index 52fad6774..bccb4ce7d 100644 --- a/packages/vant/src/action-sheet/README.zh-CN.md +++ b/packages/vant/src/action-sheet/README.zh-CN.md @@ -259,7 +259,7 @@ import type { ActionSheetProps, ActionSheetAction } from 'vant'; | --van-action-sheet-description-color | _var(--van-text-color-2)_ | - | | --van-action-sheet-description-font-size | _var(--van-font-size-md)_ | - | | --van-action-sheet-description-line-height | _var(--van-line-height-md)_ | - | -| --van-action-sheet-item-background | _var(--van-background-light)_ | - | +| --van-action-sheet-item-background | _var(--van-background-2)_ | - | | --van-action-sheet-item-font-size | _var(--van-font-size-lg)_ | - | | --van-action-sheet-item-line-height | _var(--van-line-height-lg)_ | - | | --van-action-sheet-item-text-color | _var(--van-text-color)_ | - | diff --git a/packages/vant/src/action-sheet/index.less b/packages/vant/src/action-sheet/index.less index b54e07780..3c2e6fe7b 100644 --- a/packages/vant/src/action-sheet/index.less +++ b/packages/vant/src/action-sheet/index.less @@ -7,7 +7,7 @@ body { --van-action-sheet-description-color: var(--van-text-color-2); --van-action-sheet-description-font-size: var(--van-font-size-md); --van-action-sheet-description-line-height: var(--van-line-height-md); - --van-action-sheet-item-background: var(--van-background-light); + --van-action-sheet-item-background: var(--van-background-2); --van-action-sheet-item-font-size: var(--van-font-size-lg); --van-action-sheet-item-line-height: var(--van-line-height-lg); --van-action-sheet-item-text-color: var(--van-text-color); diff --git a/packages/vant/src/address-list/index.less b/packages/vant/src/address-list/index.less index 1c50e0c1d..d129925a8 100644 --- a/packages/vant/src/address-list/index.less +++ b/packages/vant/src/address-list/index.less @@ -28,7 +28,7 @@ body { width: 100%; padding-left: var(--van-padding-md); padding-right: var(--van-padding-md); - background-color: var(--van-background-light); + background-color: var(--van-background-2); } &__add { @@ -46,7 +46,7 @@ body { .van-address-item { padding: var(--van-address-list-item-padding); - background-color: var(--van-background-light); + background-color: var(--van-background-2); border-radius: var(--van-radius-lg); &:not(:last-child) { diff --git a/packages/vant/src/badge/demo/index.vue b/packages/vant/src/badge/demo/index.vue index 1599f9d43..79cf6e16a 100644 --- a/packages/vant/src/badge/demo/index.vue +++ b/packages/vant/src/badge/demo/index.vue @@ -102,7 +102,7 @@ const t = useTranslate({ diff --git a/packages/vant/src/cell-group/index.less b/packages/vant/src/cell-group/index.less index c1c88178c..1c9d3ab84 100644 --- a/packages/vant/src/cell-group/index.less +++ b/packages/vant/src/cell-group/index.less @@ -1,5 +1,5 @@ body { - --van-cell-group-background: var(--van-background-light); + --van-cell-group-background: var(--van-background-2); --van-cell-group-title-color: var(--van-text-color-2); --van-cell-group-title-padding: var(--van-padding-md) var(--van-padding-md); --van-cell-group-title-font-size: var(--van-font-size-md); diff --git a/packages/vant/src/cell/README.md b/packages/vant/src/cell/README.md index fab509c86..c09cecc33 100644 --- a/packages/vant/src/cell/README.md +++ b/packages/vant/src/cell/README.md @@ -218,7 +218,7 @@ The component provides the following CSS variables, which can be used to customi | --van-cell-vertical-padding | _10px_ | - | | --van-cell-horizontal-padding | _var(--van-padding-md)_ | - | | --van-cell-text-color | _var(--van-text-color)_ | - | -| --van-cell-background | _var(--van-background-light)_ | - | +| --van-cell-background | _var(--van-background-2)_ | - | | --van-cell-border-color | _var(--van-border-color)_ | - | | --van-cell-active-color | _var(--van-active-color)_ | - | | --van-cell-required-color | _var(--van-danger-color)_ | - | @@ -232,7 +232,7 @@ The component provides the following CSS variables, which can be used to customi | --van-cell-large-vertical-padding | _var(--van-padding-sm)_ | - | | --van-cell-large-title-font-size | _var(--van-font-size-lg)_ | - | | --van-cell-large-label-font-size | _var(--van-font-size-md)_ | - | -| --van-cell-group-background | _var(--van-background-light)_ | - | +| --van-cell-group-background | _var(--van-background-2)_ | - | | --van-cell-group-title-color | _var(--van-text-color-2)_ | - | | --van-cell-group-title-padding | _var(--van-padding-md) var(--van-padding-md) var(--van-padding-xs)_ | - | | --van-cell-group-title-font-size | _var(--van-font-size-md)_ | - | diff --git a/packages/vant/src/cell/README.zh-CN.md b/packages/vant/src/cell/README.zh-CN.md index ab199d4ac..70cbb7920 100644 --- a/packages/vant/src/cell/README.zh-CN.md +++ b/packages/vant/src/cell/README.zh-CN.md @@ -223,7 +223,7 @@ import type { | --van-cell-vertical-padding | _10px_ | - | | --van-cell-horizontal-padding | _var(--van-padding-md)_ | - | | --van-cell-text-color | _var(--van-text-color)_ | - | -| --van-cell-background | _var(--van-background-light)_ | - | +| --van-cell-background | _var(--van-background-2)_ | - | | --van-cell-border-color | _var(--van-border-color)_ | - | | --van-cell-active-color | _var(--van-active-color)_ | - | | --van-cell-required-color | _var(--van-danger-color)_ | - | @@ -237,7 +237,7 @@ import type { | --van-cell-large-vertical-padding | _var(--van-padding-sm)_ | - | | --van-cell-large-title-font-size | _var(--van-font-size-lg)_ | - | | --van-cell-large-label-font-size | _var(--van-font-size-md)_ | - | -| --van-cell-group-background | _var(--van-background-light)_ | - | +| --van-cell-group-background | _var(--van-background-2)_ | - | | --van-cell-group-title-color | _var(--van-text-color-2)_ | - | | --van-cell-group-title-padding | _var(--van-padding-md) var(--van-padding-md) var(--van-padding-xs)_ | - | | --van-cell-group-title-font-size | _var(--van-font-size-md)_ | - | diff --git a/packages/vant/src/cell/index.less b/packages/vant/src/cell/index.less index 07f2b0110..0b7f379aa 100644 --- a/packages/vant/src/cell/index.less +++ b/packages/vant/src/cell/index.less @@ -6,7 +6,7 @@ body { --van-cell-vertical-padding: 10px; --van-cell-horizontal-padding: var(--van-padding-md); --van-cell-text-color: var(--van-text-color); - --van-cell-background: var(--van-background-light); + --van-cell-background: var(--van-background-2); --van-cell-border-color: var(--van-border-color); --van-cell-active-color: var(--van-active-color); --van-cell-required-color: var(--van-danger-color); diff --git a/packages/vant/src/col/demo/index.vue b/packages/vant/src/col/demo/index.vue index d05143189..e99f37506 100644 --- a/packages/vant/src/col/demo/index.vue +++ b/packages/vant/src/col/demo/index.vue @@ -70,7 +70,7 @@ const t = useTranslate({