alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2020-10-09 17:55:10 +08:00
parent cf65d6cbe0 a67a2dc7d0
commit 6a306c332e
22 changed files with 125 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/vant-cli/changelog.md
+6
View File
@@ -1,5 +1,11 @@
# 更新日志
### v2.6.1
`2020-10-09`
- 升级 @vant/markdown-vetur@2.0.2
### v2.6.0
`2020-09-27`
packages/vant-cli/package.json
+1 -1
View File
@@ -51,7 +51,7 @@
"@types/webpack-dev-server": "^3.11.0",
"@vant/eslint-config": "^3.0.0-alpha.2",
"@vant/markdown-loader": "^3.0.0-alpha.0",
"@vant/markdown-vetur": "^2.0.1",
"@vant/markdown-vetur": "^2.0.2",
"@vant/stylelint-config": "^1.3.0",
"@vant/touch-emulator": "^1.2.0",
"@vue/babel-plugin-jsx": "^1.0.0-rc.3",
packages/vant-cli/yarn.lock
+4 -4
View File
@@ -1727,10 +1727,10 @@
markdown-it-anchor "^5.2.5"
transliteration "^2.1.7"
"@vant/markdown-vetur@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@vant/markdown-vetur/-/markdown-vetur-2.0.1.tgz#cb0c2d33b5e5606e1dc7f3e6531c18b39d6e57a3"
integrity sha512-OhNFTQhCBlK+qIxfyw9unqU77Kf7gd5EsTUXPqg23lALWwpJiVb0IKGwxnYTZ9i7JAzTAho7oIGt7GQ0hhyvow==
"@vant/markdown-vetur@^2.0.2":
version "2.0.2"
resolved "https://registry.npm.taobao.org/@vant/markdown-vetur/download/@vant/markdown-vetur-2.0.2.tgz#8e6be188952a2c4b0e1d626bf93f47f84ab0f22d"
integrity sha1-jmvhiJUqLEsOHWJr+T9H+Eqw8i0=
dependencies:
fast-glob "^3.2.2"
fs-extra "^9.0.0"
packages/vant-icons/CHANGELOG.md
+4
View File
@@ -1,5 +1,9 @@
## Changelog
## 1.3.1
- add minus icon
## 1.3.0
- add share-o icon
packages/vant-icons/assets/icons.sketch
BIN
View File
Binary file not shown.
packages/vant-icons/build/codepoints.js
+1
View File
@@ -232,6 +232,7 @@ const map = {
F0E5: 'photo-fail',
F0E6: 'back-top',
F0E7: 'share-o',
F0E8: 'minus',
};
const reversedMap = {};
packages/vant-icons/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@vant/icons",
"version": "1.3.0",
"version": "1.3.1",
"description": "vant icons",
"main": "./src/config.js",
"files": [
packages/vant-icons/src/config.js
+5 -4
View File
@@ -1,14 +1,15 @@
module.exports = {
name: 'vant-icon',
basic: [
'success',
'plus',
'cross',
'fail',
'arrow',
'arrow-left',
'arrow-up',
'arrow-down',
'success',
'cross',
'plus',
'minus',
'fail',
],
outline: [
// has corresponding filled icon
packages/vant-icons/src/encode.less
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/vant-icons/src/index.less
+7 -3
View File
@@ -5,9 +5,9 @@
font-family: 'vant-icon';
font-style: normal;
font-display: auto;
src: url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff2') format('woff2'),
url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff') format('woff'),
url('https://img.yzcdn.cn/vant/vant-icon-0c347b.ttf') format('truetype');
src: url('https://img.yzcdn.cn/vant/vant-icon-09002a.woff2') format('woff2'),
url('https://img.yzcdn.cn/vant/vant-icon-09002a.woff') format('woff'),
url('https://img.yzcdn.cn/vant/vant-icon-09002a.ttf') format('truetype');
}
.van-icon {
@@ -563,6 +563,10 @@
content: '\F084';
}
.van-icon-minus::before {
content: '\F0E8';
}
.van-icon-more-o::before {
content: '\F085';
}