From af56eea661ddb5575446d4282b1335349a4f8de0 Mon Sep 17 00:00:00 2001 From: Yang Libin Date: Wed, 9 Dec 2020 18:06:18 +0800 Subject: [PATCH 1/3] fix: add deploy branch `gh-pages` (#7713) --- .github/workflows/sync.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index b4ff0812a..2b1473355 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -15,9 +15,9 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.GITEE_RSA_PRIVATE_KEY }} with: # 注意替换为你的 GitHub 源仓库地址 - source-repo: 'git@github.com:youzan/vant.git' + source-repo: git@github.com:youzan/vant.git # 注意替换为你的 Gitee 目标仓库地址 - destination-repo: 'git@gitee.com:vant-contrib/vant.git' + destination-repo: git@gitee.com:vant-contrib/vant.git - name: Build Gitee Pages uses: yanglbme/gitee-pages-action@master @@ -28,3 +28,5 @@ jobs: gitee-password: ${{ secrets.GITEE_PASSWORD }} # 注意替换为你的 Gitee 仓库 gitee-repo: vant-contrib/vant + # 要部署的分支 + branch: gh-pages From 990d3c09886259594286b83a38badcef9a619c88 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 10 Dec 2020 20:09:47 +0800 Subject: [PATCH 2/3] chore: release 2.11.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bec5cb5e..24d9e40a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.11.1", + "version": "2.11.2", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", From b6ab011f7de16d87b52acd558f5828d3b0f39970 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 10 Dec 2020 20:12:41 +0800 Subject: [PATCH 3/3] docs(changelog): 2.11.2 --- docs/markdown/changelog.en-US.md | 18 ++++++++++++++++++ docs/markdown/changelog.zh-CN.md | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index 45f62cd22..32f3b24b6 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -16,6 +16,24 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). ## Details +### [v2.11.2](https://github.com/youzan/vant/compare/v2.11.1...v2.11.2) + +`2020-12-10` + +**style** + +- Circle: add @circle-color less var [1a6cf6](https://github.com/youzan/vant/commit/1a6cf64f548bb19c6bd478db67f2e0a1d7c9a145) +- Circle: add @circle-layer-color less var [65a5ed](https://github.com/youzan/vant/commit/65a5ed85537b7a406655bd39f7e4f5332d780a82) +- Circle: add @circle-size less var [b57f7e](https://github.com/youzan/vant/commit/b57f7e9d9810ce95047334f0897899ebddaac6f3) +- IndexBar: adjust default highlight color to red [65b680](https://github.com/youzan/vant/commit/65b6807a7e6b8a415b5f228c5d55426cd81a1dfa) +- IndexBar: adjust sticky anchor color to red [87b0a0](https://github.com/youzan/vant/commit/87b0a034958296a720409ded893e708081c35bc5) +- IndexBar: increase right padding to 8px [aad055](https://github.com/youzan/vant/commit/aad055906484d8b6c38a9f84a768f09522b13a41) + +**Bug Fixes** + +- Popover: incorrect border position in wework [#7702](https://github.com/youzan/vant/issues/7702) +- Stepper: fix mobile safari page scroll down issue [#7701](https://github.com/youzan/vant/issues/7701) + ### [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 849565c6d..9413cfa03 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -16,6 +16,23 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 ## 更新内容 +### [v2.11.2](https://github.com/youzan/vant/compare/v2.11.1...v2.11.2) + +`2020-12-10` + +**style** + +- Circle: 新增 @circle-color Less 变量 [1a6cf6](https://github.com/youzan/vant/commit/1a6cf64f548bb19c6bd478db67f2e0a1d7c9a145) +- Circle: 新增 @circle-layer-color Less 变量 [65a5ed](https://github.com/youzan/vant/commit/65a5ed85537b7a406655bd39f7e4f5332d780a82) +- Circle: 新增 @circle-size Less 变量 [b57f7e](https://github.com/youzan/vant/commit/b57f7e9d9810ce95047334f0897899ebddaac6f3) +- IndexBar: 默认高亮颜色调整为红色 [65b680](https://github.com/youzan/vant/commit/65b6807a7e6b8a415b5f228c5d55426cd81a1dfa) [87b0a0](https://github.com/youzan/vant/commit/87b0a034958296a720409ded893e708081c35bc5) +- IndexBar: 右边距调整为 8px [aad055](https://github.com/youzan/vant/commit/aad055906484d8b6c38a9f84a768f09522b13a41) + +**Bug Fixes** + +- Popover: 修复在企业微信内边框位置错误的问题 [#7702](https://github.com/youzan/vant/issues/7702) +- Stepper: 修复在 iOS 下禁用输入框时，点击输入框会导致页面下滑的问题 [#7701](https://github.com/youzan/vant/issues/7701) + ### [v2.11.1](https://github.com/youzan/vant/compare/v2.11.0...v2.11.1) `2020-11-26`