diff --git a/packages/vant/src/action-bar-button/index.less b/packages/vant/src/action-bar-button/index.less index 8a519df7d..9df4bd0f6 100644 --- a/packages/vant/src/action-bar-button/index.less +++ b/packages/vant/src/action-bar-button/index.less @@ -1,4 +1,4 @@ -:root { +body { --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-icon/index.less b/packages/vant/src/action-bar-icon/index.less index b118e36a2..809efdc39 100644 --- a/packages/vant/src/action-bar-icon/index.less +++ b/packages/vant/src/action-bar-icon/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-action-bar-icon-width: 48px; --van-action-bar-icon-height: 100%; --van-action-bar-icon-color: var(--van-text-color); diff --git a/packages/vant/src/action-bar/index.less b/packages/vant/src/action-bar/index.less index 8457bd0c6..86c3feced 100644 --- a/packages/vant/src/action-bar/index.less +++ b/packages/vant/src/action-bar/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-action-bar-background: var(--van-background-light); --van-action-bar-height: 50px; } diff --git a/packages/vant/src/action-sheet/index.less b/packages/vant/src/action-sheet/index.less index 265ab51ab..b54e07780 100644 --- a/packages/vant/src/action-sheet/index.less +++ b/packages/vant/src/action-sheet/index.less @@ -1,6 +1,6 @@ @import '../style/mixins/hairline'; -:root { +body { --van-action-sheet-max-height: 80%; --van-action-sheet-header-height: 48px; --van-action-sheet-header-font-size: var(--van-font-size-lg); diff --git a/packages/vant/src/address-edit/index.less b/packages/vant/src/address-edit/index.less index f5be05099..653bb2e5f 100644 --- a/packages/vant/src/address-edit/index.less +++ b/packages/vant/src/address-edit/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-address-edit-padding: var(--van-padding-sm); --van-address-edit-buttons-padding: var(--van-padding-xl) var(--van-padding-base); diff --git a/packages/vant/src/address-list/index.less b/packages/vant/src/address-list/index.less index 2f33e8ae6..1c50e0c1d 100644 --- a/packages/vant/src/address-list/index.less +++ b/packages/vant/src/address-list/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-address-list-padding: var(--van-padding-sm) var(--van-padding-sm) 80px; --van-address-list-disabled-text-color: var(--van-text-color-2); --van-address-list-disabled-text-padding: calc(var(--van-padding-base) * 5) 0; diff --git a/packages/vant/src/badge/index.less b/packages/vant/src/badge/index.less index a5580eeb8..6b2d1eaca 100644 --- a/packages/vant/src/badge/index.less +++ b/packages/vant/src/badge/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-badge-size: 16px; --van-badge-color: var(--van-white); --van-badge-padding: 0 3px; diff --git a/packages/vant/src/button/index.less b/packages/vant/src/button/index.less index 52f3e4d45..02a7cf6c4 100644 --- a/packages/vant/src/button/index.less +++ b/packages/vant/src/button/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-button-mini-height: 24px; --van-button-mini-padding: 0 var(--van-padding-base); --van-button-mini-font-size: var(--van-font-size-xs); @@ -35,6 +35,10 @@ --van-button-loading-icon-size: 20px; } +.van-theme-dark { + --van-button-plain-background: transparent; +} + .van-button { position: relative; display: inline-block; diff --git a/packages/vant/src/calendar/index.less b/packages/vant/src/calendar/index.less index de5149f4e..f208dfc77 100644 --- a/packages/vant/src/calendar/index.less +++ b/packages/vant/src/calendar/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-calendar-background: var(--van-background-light); --van-calendar-popup-height: 80%; --van-calendar-header-shadow: 0 2px 10px rgba(125, 126, 128, 0.16); @@ -26,6 +26,11 @@ --van-calendar-confirm-button-margin: 7px 0; } +.van-theme-dark { + --van-calendar-month-mark-color: rgba(100, 101, 102, 0.2); + --van-calendar-day-disabled-color: var(--van-gray-7); +} + .van-calendar { display: flex; flex-direction: column; diff --git a/packages/vant/src/card/index.less b/packages/vant/src/card/index.less index fb412ca9d..2580c1315 100644 --- a/packages/vant/src/card/index.less +++ b/packages/vant/src/card/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-card-padding: var(--van-padding-xs) var(--van-padding-md); --van-card-font-size: var(--van-font-size-sm); --van-card-text-color: var(--van-text-color); diff --git a/packages/vant/src/cascader/index.less b/packages/vant/src/cascader/index.less index c1a53d94f..0ed61a5b7 100644 --- a/packages/vant/src/cascader/index.less +++ b/packages/vant/src/cascader/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-cascader-header-height: 48px; --van-cascader-header-padding: 0 var(--van-padding-md); --van-cascader-title-font-size: var(--van-font-size-lg); diff --git a/packages/vant/src/cell-group/index.less b/packages/vant/src/cell-group/index.less index 7399c5931..c1c88178c 100644 --- a/packages/vant/src/cell-group/index.less +++ b/packages/vant/src/cell-group/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-cell-group-background: var(--van-background-light); --van-cell-group-title-color: var(--van-text-color-2); --van-cell-group-title-padding: var(--van-padding-md) var(--van-padding-md); diff --git a/packages/vant/src/cell/index.less b/packages/vant/src/cell/index.less index 7df7b23a8..07f2b0110 100644 --- a/packages/vant/src/cell/index.less +++ b/packages/vant/src/cell/index.less @@ -1,6 +1,6 @@ @import '../style/mixins/hairline'; -:root { +body { --van-cell-font-size: var(--van-font-size-md); --van-cell-line-height: 24px; --van-cell-vertical-padding: 10px; diff --git a/packages/vant/src/checkbox/index.less b/packages/vant/src/checkbox/index.less index f64a42e98..be80dc6ea 100644 --- a/packages/vant/src/checkbox/index.less +++ b/packages/vant/src/checkbox/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-checkbox-size: 20px; --van-checkbox-border-color: var(--van-gray-5); --van-checkbox-duration: var(--van-duration-fast); diff --git a/packages/vant/src/circle/index.less b/packages/vant/src/circle/index.less index 503d5f484..356c32939 100644 --- a/packages/vant/src/circle/index.less +++ b/packages/vant/src/circle/index.less @@ -1,4 +1,4 @@ -:root { +body { --van-circle-size: 100px; --van-circle-color: var(--van-primary-color); --van-circle-layer-color: var(--van-white); diff --git a/packages/vant/src/collapse-item/index.less b/packages/vant/src/collapse-item/index.less index 68e5c26a8..c1beaaf5b 100644 --- a/packages/vant/src/collapse-item/index.less +++ b/packages/vant/src/collapse-item/index.less @@ -1,6 +1,6 @@ @import '../style/mixins/hairline'; -:root { +body { --van-collapse-item-duration: var(--van-duration-base); --van-collapse-item-content-padding: var(--van-padding-sm) var(--van-padding-md); diff --git a/packages/vant/src/config-provider/README.md b/packages/vant/src/config-provider/README.md index 51589536c..ba88354cd 100644 --- a/packages/vant/src/config-provider/README.md +++ b/packages/vant/src/config-provider/README.md @@ -33,10 +33,10 @@ Looking at the style of the Button component, you can see that the following var } ``` -The default values of these variables are defined on the `root` node: +The default values of these variables are defined on the `body` node: ```css -:root { +body { --van-white: #fff; --van-blue: #1989fa; --van-button-primary-color: var(--van-white); @@ -52,7 +52,7 @@ You can directly override these CSS variables in the code, and the style of the ```css /* the Primary Button will turn red */ -:root { +body { --van-button-primary-background: red; } ``` @@ -120,8 +120,8 @@ CSS variables in Vant are divided into **basic variables** and **component varia #### Modify Basic Variables -- The basic variables can only be modified through the `root` selector. -- The component variables can be modified through the `root` selector and `ConfigProvider` component. +- The basic variables can only be modified through the `body` selector. +- The component variables can be modified through the `body` selector and `ConfigProvider` component. #### Variable List diff --git a/packages/vant/src/config-provider/README.zh-CN.md b/packages/vant/src/config-provider/README.zh-CN.md index 8d88bbe2a..5b2d35622 100644 --- a/packages/vant/src/config-provider/README.zh-CN.md +++ b/packages/vant/src/config-provider/README.zh-CN.md @@ -33,10 +33,10 @@ Vant 组件通过丰富的 [CSS 变量](https://developer.mozilla.org/zh-CN/docs } ``` -这些变量的默认值被定义在 `root` 节点上,HTML 文档的任何节点都可以访问到这些变量: +这些变量的默认值被定义在 `body` 节点上,body 下所有子节点都可以访问到这些变量: ```css -:root { +body { --van-white: #fff; --van-blue: #1989fa; --van-button-primary-color: var(--van-white); @@ -52,7 +52,7 @@ Vant 组件通过丰富的 [CSS 变量](https://developer.mozilla.org/zh-CN/docs ```css /* 添加这段样式后,Primary Button 会变成红色 */ -:root { +body { --van-button-primary-background: red; } ``` @@ -112,7 +112,7 @@ export default { }; ``` -> 注意:ConfigProvider 仅影响它的子组件的样式,不影响全局 root 节点。 +> 注意:ConfigProvider 仅影响它的子组件的样式,不影响全局 body 节点。 ### 基础变量 @@ -122,8 +122,8 @@ Vant 中的 CSS 变量分为 **基础变量** 和 **组件变量**。组件变 由于 CSS 变量继承机制的原因,两者的修改方式有一定差异: -- 基础变量只能通过 `root 选择器` 修改,不能通过 `ConfigProvider 组件` 修改。 -- 组件变量可以通过 `root 选择器` 和 `ConfigProvider 组件` 修改。 +- 基础变量只能通过 `body 选择器` 修改,不能通过 `ConfigProvider 组件` 修改。 +- 组件变量可以通过 `body 选择器` 和 `ConfigProvider 组件` 修改。 #### 变量列表 diff --git a/packages/vant/src/config-provider/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/config-provider/test/__snapshots__/demo.spec.ts.snap index e4325a3ec..be806aafa 100644 --- a/packages/vant/src/config-provider/test/__snapshots__/demo.spec.ts.snap +++ b/packages/vant/src/config-provider/test/__snapshots__/demo.spec.ts.snap @@ -122,7 +122,7 @@ exports[`should render demo and match snapshot 1`] = `