diff --git a/docs/markdown/theme.en-US.md b/docs/markdown/theme.en-US.md index 5423fc242..912ffa2cb 100644 --- a/docs/markdown/theme.en-US.md +++ b/docs/markdown/theme.en-US.md @@ -17,7 +17,7 @@ There are some basic variables below, all available variables could be found in @orange: #ff976a; @orange-dark: #ed6a0c; @orange-light: #fffbe8; -@green: #4b0; +@green: #07c160; @gray: #c9c9c9; @gray-light: #e5e5e5; @gray-darker: #7d7e80; diff --git a/docs/markdown/theme.zh-CN.md b/docs/markdown/theme.zh-CN.md index 8d33923ac..05957648e 100644 --- a/docs/markdown/theme.zh-CN.md +++ b/docs/markdown/theme.zh-CN.md @@ -21,7 +21,7 @@ Vant 使用了 [Less](http://lesscss.org/) 对样式进行预处理,并内置 @orange: #ff976a; @orange-dark: #ed6a0c; @orange-light: #fffbe8; -@green: #4b0; +@green: #07c160; @gray: #c9c9c9; @gray-light: #e5e5e5; @gray-darker: #7d7e80; diff --git a/packages/checkbox/demo/index.vue b/packages/checkbox/demo/index.vue index eb0ce0932..d724a44b6 100644 --- a/packages/checkbox/demo/index.vue +++ b/packages/checkbox/demo/index.vue @@ -22,7 +22,7 @@ {{ $t('customColor') }} diff --git a/packages/checkbox/en-US.md b/packages/checkbox/en-US.md index b806171b6..e9181a990 100644 --- a/packages/checkbox/en-US.md +++ b/packages/checkbox/en-US.md @@ -34,7 +34,7 @@ export default { #### Custom Color ```html -Checkbox +Checkbox ``` #### Custom Icon diff --git a/packages/checkbox/test/__snapshots__/demo.spec.js.snap b/packages/checkbox/test/__snapshots__/demo.spec.js.snap index fa8a79e00..cca1c1386 100644 --- a/packages/checkbox/test/__snapshots__/demo.spec.js.snap +++ b/packages/checkbox/test/__snapshots__/demo.spec.js.snap @@ -27,7 +27,7 @@ exports[`renders demo correctly 1`] = `
-
+
自定义颜色 diff --git a/packages/checkbox/zh-CN.md b/packages/checkbox/zh-CN.md index 442a071b3..a93a55ff6 100644 --- a/packages/checkbox/zh-CN.md +++ b/packages/checkbox/zh-CN.md @@ -36,7 +36,7 @@ export default { #### 自定义颜色 ```html -复选框 +复选框 ``` #### 自定义图标 diff --git a/packages/circle/demo/index.vue b/packages/circle/demo/index.vue index 08eb769ee..67fc0cc66 100644 --- a/packages/circle/demo/index.vue +++ b/packages/circle/demo/index.vue @@ -10,7 +10,7 @@ />
- +
0%
diff --git a/packages/circle/zh-CN.md b/packages/circle/zh-CN.md index a3ff7d347..dafc54198 100644 --- a/packages/circle/zh-CN.md +++ b/packages/circle/zh-CN.md @@ -41,7 +41,7 @@ export default { ```html {{ $t('radio') }} diff --git a/packages/radio/en-US.md b/packages/radio/en-US.md index 39bb7cafb..289ef2f8b 100644 --- a/packages/radio/en-US.md +++ b/packages/radio/en-US.md @@ -43,7 +43,7 @@ export default { #### Custom Color ```html -Radio +Radio ``` #### Inside a Cell diff --git a/packages/radio/test/__snapshots__/demo.spec.js.snap b/packages/radio/test/__snapshots__/demo.spec.js.snap index d72a6a4f1..3a8976c6c 100644 --- a/packages/radio/test/__snapshots__/demo.spec.js.snap +++ b/packages/radio/test/__snapshots__/demo.spec.js.snap @@ -15,7 +15,7 @@ exports[`renders demo correctly 1`] = `
-
+
单选框
diff --git a/packages/radio/zh-CN.md b/packages/radio/zh-CN.md index 87eee6ef1..20c235507 100644 --- a/packages/radio/zh-CN.md +++ b/packages/radio/zh-CN.md @@ -45,7 +45,7 @@ export default { #### 自定义颜色 ```html -复选框 +复选框 ``` #### 与 Cell 组件一起使用 diff --git a/packages/rate/demo/index.vue b/packages/rate/demo/index.vue index 6316b5561..c75b56811 100644 --- a/packages/rate/demo/index.vue +++ b/packages/rate/demo/index.vue @@ -17,7 +17,7 @@ v-model="value3" :size="25" :count="6" - color="#2ba" + color="#07c160" void-color="#ceefe8" /> diff --git a/packages/rate/en-US.md b/packages/rate/en-US.md index 35ef0e7bc..22cf1173c 100644 --- a/packages/rate/en-US.md +++ b/packages/rate/en-US.md @@ -42,7 +42,7 @@ export default { v-model="value" :size="25" :count="6" - color="#2ba" + color="#07c160" void-color="#ceefe8" /> ``` diff --git a/packages/rate/test/__snapshots__/demo.spec.js.snap b/packages/rate/test/__snapshots__/demo.spec.js.snap index 60bba0980..3a333a905 100644 --- a/packages/rate/test/__snapshots__/demo.spec.js.snap +++ b/packages/rate/test/__snapshots__/demo.spec.js.snap @@ -29,13 +29,13 @@ exports[`renders demo correctly 1`] = `
-
+
- + - + - + diff --git a/packages/rate/zh-CN.md b/packages/rate/zh-CN.md index 282c3dd9b..d62416385 100644 --- a/packages/rate/zh-CN.md +++ b/packages/rate/zh-CN.md @@ -42,7 +42,7 @@ export default { v-model="value" :size="25" :count="6" - color="#2ba" + color="#07c160" void-color="#ceefe8" /> ``` diff --git a/packages/steps/en-US.md b/packages/steps/en-US.md index eed443cf6..879ff611b 100644 --- a/packages/steps/en-US.md +++ b/packages/steps/en-US.md @@ -59,7 +59,7 @@ export default { | title | Title | `String` | - | | description | Description | `String` | - | | direction | Can be set to `horizontal` `vertical` | `String` | `horizontal` | -| active-color | Active step color | `String` | `#4b0` | +| active-color | Active step color | `String` | `#07c160` | ### Steps Slot diff --git a/packages/steps/test/__snapshots__/demo.spec.js.snap b/packages/steps/test/__snapshots__/demo.spec.js.snap index 69d9189ad..03534e3c4 100644 --- a/packages/steps/test/__snapshots__/demo.spec.js.snap +++ b/packages/steps/test/__snapshots__/demo.spec.js.snap @@ -12,8 +12,8 @@ exports[`renders demo correctly 1`] = `
-
商家接单
-
+
商家接单
+
diff --git a/packages/steps/zh-CN.md b/packages/steps/zh-CN.md index 9c6eebca4..926bd1d13 100644 --- a/packages/steps/zh-CN.md +++ b/packages/steps/zh-CN.md @@ -60,7 +60,7 @@ export default { | icon | 描述栏图标 | `String` | - | - | | icon-class | 图标额外类名 | `String` | - | - | | direction | 显示方向,可选值为 `vertical` | `String` | `horizontal` | - | -| active-color | 激活状态颜色 | `String` | `#4b0` | - | +| active-color | 激活状态颜色 | `String` | `#07c160` | - | ### Steps Slot diff --git a/packages/style/var.less b/packages/style/var.less index d9b3d534c..ca80533da 100644 --- a/packages/style/var.less +++ b/packages/style/var.less @@ -6,7 +6,7 @@ @orange: #ff976a; @orange-dark: #ed6a0c; @orange-light: #fffbe8; -@green: #4b0; +@green: #07c160; @gray: #c8c9cc; @gray-light: #e5e5e5; @gray-darker: #7d7e80; diff --git a/packages/switch/demo/index.vue b/packages/switch/demo/index.vue index 488268526..de73ac5e3 100644 --- a/packages/switch/demo/index.vue +++ b/packages/switch/demo/index.vue @@ -28,7 +28,7 @@ diff --git a/packages/switch/en-US.md b/packages/switch/en-US.md index 3b355b85d..20eb3302b 100644 --- a/packages/switch/en-US.md +++ b/packages/switch/en-US.md @@ -57,7 +57,7 @@ export default { ```html ``` diff --git a/packages/switch/test/__snapshots__/demo.spec.js.snap b/packages/switch/test/__snapshots__/demo.spec.js.snap index 4aa45321e..344cb5833 100644 --- a/packages/switch/test/__snapshots__/demo.spec.js.snap +++ b/packages/switch/test/__snapshots__/demo.spec.js.snap @@ -31,7 +31,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/packages/switch/zh-CN.md b/packages/switch/zh-CN.md index e976ddbe3..c90214118 100644 --- a/packages/switch/zh-CN.md +++ b/packages/switch/zh-CN.md @@ -57,7 +57,7 @@ export default { ```html ``` diff --git a/packages/tabbar/demo/index.vue b/packages/tabbar/demo/index.vue index 8a2fcfaa2..eba77a9d1 100644 --- a/packages/tabbar/demo/index.vue +++ b/packages/tabbar/demo/index.vue @@ -42,7 +42,7 @@ {{ $t('tab') }} {{ $t('tab') }} diff --git a/packages/tabbar/zh-CN.md b/packages/tabbar/zh-CN.md index cc19ed004..3158bb7ec 100644 --- a/packages/tabbar/zh-CN.md +++ b/packages/tabbar/zh-CN.md @@ -69,7 +69,7 @@ export default { ```html 标签 标签 diff --git a/packages/tag/test/__snapshots__/demo.spec.js.snap b/packages/tag/test/__snapshots__/demo.spec.js.snap index 9d651fa66..bb9b716c5 100644 --- a/packages/tag/test/__snapshots__/demo.spec.js.snap +++ b/packages/tag/test/__snapshots__/demo.spec.js.snap @@ -2,26 +2,26 @@ exports[`renders demo correctly 1`] = `
-
标签 标签 标签 标签
+
标签 标签 标签 标签
标签 标签 标签 - + 标签
标签 标签 标签 - + 标签
标签 标签 标签 - + 标签
标签 diff --git a/packages/utils/color.js b/packages/utils/color.js index c4ca03cc1..168d0bfcc 100644 --- a/packages/utils/color.js +++ b/packages/utils/color.js @@ -1,5 +1,5 @@ export const RED = '#f44'; export const BLUE = '#1989fa'; -export const GREEN = '#4b0'; +export const GREEN = '#07c160'; export const WHITE = '#fff'; export const GRAY_DARK = '#969799'; diff --git a/yarn.lock b/yarn.lock index 5ce0cf4ae..47a7e13ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,7 +124,7 @@ "@babel/helper-member-expression-to-functions@^7.0.0": version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd107c160a0df7ff00f009e7d7a436945f47c7a16f" dependencies: "@babel/types" "^7.0.0" @@ -705,7 +705,7 @@ "@vant/eslint-config@^1.0.8": version "1.0.8" - resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-1.0.8.tgz#213358538f6335c06cf8f944b01e308f2aec2aef" + resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-1.0.8.tgz#213358538f6335c06cf8f9407c1601e308f2aec2aef" dependencies: babel-eslint "^10.0.1" eslint-config-airbnb-base "^13.1.0" @@ -1272,7 +1272,7 @@ array-unique@^0.3.2: arrify@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a07c160d" asap@~2.0.3: version "2.0.6" @@ -2190,7 +2190,7 @@ config-chain@^1.1.12: configstore@^3.0.0: version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd334107c16001fe81a543f8f" dependencies: dot-prop "^4.1.0" graceful-fs "^4.1.2" @@ -2660,7 +2660,7 @@ detect-libc@^1.0.2: detect-newline@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be07c1600e87b5f13da680759f2c5bfd3e2" detective-amd@^3.0.0: version "3.0.0" @@ -2978,7 +2978,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-iterator@~2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a907c160854403b2d0a0fbfa98f3b7" dependencies: d "1" es5-ext "^0.10.35" @@ -3599,7 +3599,7 @@ for-own@^0.1.4: for-own@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc07c1604dbfe70cf836494c53cb44b" dependencies: for-in "^1.0.1" @@ -4548,7 +4548,7 @@ is-descriptor@^0.1.0: is-descriptor@^1.0.0, is-descriptor@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a666007c1604f8c81524ba365c5f14d86ec" dependencies: is-accessor-descriptor "^1.0.0" is-data-descriptor "^1.0.0" @@ -4765,7 +4765,7 @@ is-url@^1.2.4: is-utf8@^0.2.0: version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#07c160da1442104d1b336340e80797e865cf39f7d72" is-whitespace-character@^1.0.0: version "1.0.2" @@ -5891,7 +5891,7 @@ makeerror@1.0.x: map-age-cleaner@^0.1.1: version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe4707c160f45078e6e1b4b92a" dependencies: p-defer "^1.0.0" @@ -6594,7 +6594,7 @@ object.entries@^1.0.4: object.getownpropertydescriptors@^2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f107c16051caa16" dependencies: define-properties "^1.1.2" es-abstract "^1.5.1" @@ -7485,7 +7485,7 @@ read-pkg@^4.0.1: "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf907c160c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -7568,7 +7568,7 @@ regenerator-runtime@^0.12.0: regenerator-transform@^0.13.3: version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce207c1606e0636496b2c856b57bcbb" dependencies: private "^0.1.6" @@ -7686,7 +7686,7 @@ remark-stringify@^5.0.0: remark@^9.0.0: version "9.0.0" - resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60" + resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c07c160f12bfdbd3a67d8b2f60" dependencies: remark-parse "^5.0.0" remark-stringify "^5.0.0" @@ -7977,7 +7977,7 @@ semver-compare@^1.0.0: semver-diff@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e07c160cf1a68fd726ec6d645d6d36" dependencies: semver "^5.0.3" @@ -8188,7 +8188,7 @@ sparkles@^1.0.0: spdx-correct@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f1507c16074e218c87c003cd31df4" dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -9176,7 +9176,7 @@ vue-hot-reload-api@^2.3.0: vue-jest@^3.0.1: version "3.0.2" - resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.2.tgz#c64bf5da9abd0d3ee16071217037696d14b0689c" + resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.2.tgz#c64bf5da9abd0d3ee16071217037696d107c160689c" dependencies: babel-plugin-transform-es2015-modules-commonjs "^6.26.0" chalk "^2.1.0" @@ -9552,7 +9552,7 @@ yallist@^2.1.2: yallist@^3.0.0, yallist@^3.0.2: version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b07c16049e314be545e3ce802236d6cd22cd91c3de9" yargs-parser@^10.0.0: version "10.1.0"