From 38c4f506e7c851d30ee324197d32fbf986ee3ec0 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 26 Nov 2020 23:04:13 +0800 Subject: [PATCH 1/9] docs(Badge): add content slot demo (#7647) * docs(Badge): add content slot demo * docs: fix content --- src/badge/README.md | 70 ++++++++++++++++--- src/badge/README.zh-CN.md | 51 +++++++++++++- src/badge/demo/index.vue | 48 ++++++++++++- .../test/__snapshots__/demo.spec.js.snap | 36 +++++++++- 4 files changed, 188 insertions(+), 17 deletions(-) diff --git a/src/badge/README.md b/src/badge/README.md index dc926d836..2f5829491 100644 --- a/src/badge/README.md +++ b/src/badge/README.md @@ -14,7 +14,13 @@ Vue.use(Badge); ### Basic Usage ```html - + +
+ + +
+ +
@@ -23,8 +29,8 @@ Vue.use(Badge); diff --git a/src/badge/test/__snapshots__/demo.spec.js.snap b/src/badge/test/__snapshots__/demo.spec.js.snap index 29e88b7b1..7d4fd4dea 100644 --- a/src/badge/test/__snapshots__/demo.spec.js.snap +++ b/src/badge/test/__snapshots__/demo.spec.js.snap @@ -7,6 +7,14 @@ exports[`renders demo correctly 1`] = `
5
+
+
+
10
+
+
+
+
Hot
+
@@ -17,6 +25,10 @@ exports[`renders demo correctly 1`] = `
9+
+
+
+
20+
+
99+
@@ -27,13 +39,35 @@ exports[`renders demo correctly 1`] = `
5
+
+
+
10
+
-
99+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
20
+
99+
`; From a682d24e23e0347a882ae30ba899dd27bcb6dad1 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 29 Nov 2020 09:49:29 +0800 Subject: [PATCH 2/9] docs(changelog): add 3.x link (#7655) * docs(changelog): add 3.x link * docs: fix version --- docs/markdown/changelog.en-US.md | 6 ++++++ docs/markdown/changelog.zh-CN.md | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index 9a963a53d..45f62cd22 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -1,5 +1,9 @@ # Changelog +### Tips + +The current document is the changelog of Vant 2.x. If you want to view the changelog of Vant 3.x, please visit [Vant 3.x Changelog](https://youzan.github.io/vant/next/#/en-US/changelog). + ### Intro Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). @@ -10,6 +14,8 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). - Minor version：released every one to two months, including backwards compatible features. - Major version：including breaking changes and new features. +## Details + ### [v2.11.1](https://github.com/youzan/vant/compare/v2.11.0...v2.11.1) `2020-11-26` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index 551294810..849565c6d 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -1,5 +1,9 @@ # 更新日志 +### 提示 + +当前文档为 Vant 2.x 版本的更新日志，如需查询 Vant 3.x 的更新内容，请访问 [Vant 3.x 更新日志](https://youzan.github.io/vant/next/#/zh-CN/changelog)。 + ### 介绍 Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 @@ -10,6 +14,8 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +## 更新内容 + ### [v2.11.1](https://github.com/youzan/vant/compare/v2.11.0...v2.11.1) `2020-11-26` @@ -29,7 +35,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 **Bug Fixes** -- Button: 修复图标按钮和图标按钮无法垂直对齐的问题 [#7636](https://github.com/youzan/vant/issues/7636) +- Button: 修复图标按钮和非图标按钮无法垂直对齐的问题 [#7636](https://github.com/youzan/vant/issues/7636) - Popover: 修复在 nuxt.js 上编译报错的问题 [f3ad7e](https://github.com/youzan/vant/commit/f3ad7ed1a77cd2f19001489ea64df0d61429ce33) ### [v2.11.0](https://github.com/youzan/vant/compare/v2.10.14...v2.11.0) From 65b6807a7e6b8a415b5f228c5d55426cd81a1dfa Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Mon, 30 Nov 2020 22:14:19 +0800 Subject: [PATCH 3/9] style(IndexBar): adjust default highlight color to red --- src/index-bar/README.md | 4 ++-- src/index-bar/README.zh-CN.md | 4 ++-- src/style/var.less | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index-bar/README.md b/src/index-bar/README.md index 8fad5d0fd..85cf45fb0 100644 --- a/src/index-bar/README.md +++ b/src/index-bar/README.md @@ -68,7 +68,7 @@ export default { | z-index | z-index | _number \| string_ | `1` | | sticky | Whether to enable anchor sticky top | _boolean_ | `true` | | sticky-offset-top | Anchor offset top when sticky | _number_ | `0` | -| highlight-color | Index character highlight color | _string_ | `#07c160` | - | +| highlight-color | Index character highlight color | _string_ | `#ee0a24` | - | ### IndexAnchor Props @@ -98,7 +98,7 @@ How to use: [Custom Theme](#/en-US/theme). | @index-bar-sidebar-z-index | `2` | - | | @index-bar-index-font-size | `@font-size-xs` | - | | @index-bar-index-line-height | `@line-height-xs` | - | -| @index-bar-index-active-color | `@green` | - | +| @index-bar-index-active-color | `@red` | - | | @index-anchor-z-index | `1` | - | | @index-anchor-padding | `0 @padding-md` | - | | @index-anchor-text-color | `@text-color` | - | diff --git a/src/index-bar/README.zh-CN.md b/src/index-bar/README.zh-CN.md index 1101d3ff4..b8ed59489 100644 --- a/src/index-bar/README.zh-CN.md +++ b/src/index-bar/README.zh-CN.md @@ -72,7 +72,7 @@ export default { | z-index | z-index 层级 | _number \| string_ | `1` | | sticky | 是否开启锚点自动吸顶 | _boolean_ | `true` | | sticky-offset-top | 锚点自动吸顶时与顶部的距离 | _number_ | `0` | -| highlight-color | 索引字符高亮颜色 | _string_ | `#07c160` | +| highlight-color | 索引字符高亮颜色 | _string_ | `#ee0a24` | ### IndexAnchor Props @@ -102,7 +102,7 @@ export default { | @index-bar-sidebar-z-index | `2` | - | | @index-bar-index-font-size | `@font-size-xs` | - | | @index-bar-index-line-height | `@line-height-xs` | - | -| @index-bar-index-active-color | `@green` | - | +| @index-bar-index-active-color | `@red` | - | | @index-anchor-z-index | `1` | - | | @index-anchor-padding | `0 @padding-md` | - | | @index-anchor-text-color | `@text-color` | - | diff --git a/src/style/var.less b/src/style/var.less index 84a405520..f7294a19f 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -421,7 +421,7 @@ @index-bar-sidebar-z-index: 2; @index-bar-index-font-size: @font-size-xs; @index-bar-index-line-height: @line-height-xs; -@index-bar-index-active-color: @green; +@index-bar-index-active-color: @red; // Info @info-size: 16px; From 87b0a034958296a720409ded893e708081c35bc5 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Mon, 30 Nov 2020 22:19:37 +0800 Subject: [PATCH 4/9] style(IndexBar): adjust sticky anchor color to red --- src/index-bar/README.md | 2 +- src/index-bar/README.zh-CN.md | 2 +- src/style/var.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index-bar/README.md b/src/index-bar/README.md index 85cf45fb0..2f61f4114 100644 --- a/src/index-bar/README.md +++ b/src/index-bar/README.md @@ -106,5 +106,5 @@ How to use: [Custom Theme](#/en-US/theme). | @index-anchor-font-size | `@font-size-md` | - | | @index-anchor-line-height | `32px` | - | | @index-anchor-background-color | `transparent` | - | -| @index-anchor-sticky-text-color | `@green` | - | +| @index-anchor-sticky-text-color | `@red` | - | | @index-anchor-sticky-background-color | `@white` | - | diff --git a/src/index-bar/README.zh-CN.md b/src/index-bar/README.zh-CN.md index b8ed59489..913738a86 100644 --- a/src/index-bar/README.zh-CN.md +++ b/src/index-bar/README.zh-CN.md @@ -110,5 +110,5 @@ export default { | @index-anchor-font-size | `@font-size-md` | - | | @index-anchor-line-height | `32px` | - | | @index-anchor-background-color | `transparent` | - | -| @index-anchor-sticky-text-color | `@green` | - | +| @index-anchor-sticky-text-color | `@red` | - | | @index-anchor-sticky-background-color | `@white` | - | diff --git a/src/style/var.less b/src/style/var.less index f7294a19f..47170e94b 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -414,7 +414,7 @@ @index-anchor-font-size: @font-size-md; @index-anchor-line-height: 32px; @index-anchor-background-color: transparent; -@index-anchor-sticky-text-color: @green; +@index-anchor-sticky-text-color: @red; @index-anchor-sticky-background-color: @white; // IndexBar From aad055906484d8b6c38a9f84a768f09522b13a41 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Mon, 30 Nov 2020 22:21:18 +0800 Subject: [PATCH 5/9] style(IndexBar): increase right padding to 8px --- src/index-bar/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index-bar/index.less b/src/index-bar/index.less index 1ee621e60..30677b219 100644 --- a/src/index-bar/index.less +++ b/src/index-bar/index.less @@ -15,7 +15,7 @@ } &__index { - padding: 0 @padding-base 0 @padding-md; + padding: 0 @padding-xs 0 @padding-md; font-weight: @font-weight-bold; font-size: @index-bar-index-font-size; line-height: @index-bar-index-line-height; From bb18310f1b1088bfa5a57f12a3c416e49f472483 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Mon, 30 Nov 2020 22:39:37 +0800 Subject: [PATCH 6/9] docs: uniform color --- src/calendar/README.md | 2 +- src/calendar/README.zh-CN.md | 2 +- src/calendar/demo/index.vue | 4 ++-- src/checkbox/README.md | 2 +- src/checkbox/README.zh-CN.md | 2 +- src/checkbox/demo/index.vue | 2 +- src/checkbox/test/__snapshots__/demo.spec.js.snap | 2 +- src/goods-action/README.md | 2 +- src/goods-action/README.zh-CN.md | 6 +++--- src/goods-action/demo/index.vue | 2 +- .../test/__snapshots__/demo.spec.js.snap | 2 +- src/icon/README.md | 4 ++-- src/icon/README.zh-CN.md | 4 ++-- src/icon/demo/index.vue | 10 +++++----- src/radio/README.md | 4 ++-- src/radio/README.zh-CN.md | 4 ++-- src/radio/demo/index.vue | 12 ++++-------- src/radio/test/__snapshots__/demo.spec.js.snap | 4 ++-- src/switch/README.md | 2 +- src/switch/README.zh-CN.md | 2 +- src/switch/demo/index.vue | 4 ++-- src/switch/test/__snapshots__/demo.spec.js.snap | 2 +- src/tabbar/README.md | 2 +- src/tabbar/README.zh-CN.md | 2 +- src/tabbar/demo/index.vue | 2 +- src/tabbar/test/__snapshots__/demo.spec.js.snap | 2 +- src/utils/constant.ts | 1 - 27 files changed, 42 insertions(+), 47 deletions(-) diff --git a/src/calendar/README.md b/src/calendar/README.md index c401bd61b..b15546804 100644 --- a/src/calendar/README.md +++ b/src/calendar/README.md @@ -111,7 +111,7 @@ Set `show-confirm` to `false` to hide the confirm button. In this case, the `con Use `color` prop to custom calendar color. ```html - + ``` ### Custom Date Range diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index e02e25010..466ea73b1 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -113,7 +113,7 @@ export default { 通过 `color` 属性可以自定义日历的颜色，对选中日期和底部按钮生效。 ```html - + ``` ### 自定义日期范围 diff --git a/src/calendar/demo/index.vue b/src/calendar/demo/index.vue index 5b2c7a767..c075efb88 100644 --- a/src/calendar/demo/index.vue +++ b/src/calendar/demo/index.vue @@ -121,7 +121,7 @@ diff --git a/src/calendar/demo/index.vue b/src/calendar/demo/index.vue index c075efb88..5190d6ab7 100644 --- a/src/calendar/demo/index.vue +++ b/src/calendar/demo/index.vue @@ -121,8 +121,6 @@ diff --git a/src/dropdown-menu/demo/index.vue b/src/dropdown-menu/demo/index.vue index b3685b29d..4260615dd 100644 --- a/src/dropdown-menu/demo/index.vue +++ b/src/dropdown-menu/demo/index.vue @@ -37,7 +37,7 @@ - + @@ -60,7 +60,7 @@