Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
48 changed files with 259 additions and 178 deletions

View File

@@ -44,7 +44,7 @@ export default {
### Custom Color
```html
<van-checkbox v-model="checked" checked-color="#07c160">Checkbox</van-checkbox>
<van-checkbox v-model="checked" checked-color="#ee0a24">Checkbox</van-checkbox>
```
### Custom Icon Size

View File

@@ -56,7 +56,7 @@ export default {
通过 `checked-color` 属性设置选中状态的图标颜色。
```html
<van-checkbox v-model="checked" checked-color="#07c160">复选框</van-checkbox>
<van-checkbox v-model="checked" checked-color="#ee0a24">复选框</van-checkbox>
```
### 自定义大小

View File

@@ -19,7 +19,7 @@
</demo-block>
<demo-block :title="t('customColor')">
<van-checkbox v-model="checkbox2" checked-color="#07c160">
<van-checkbox v-model="checkbox2" checked-color="#ee0a24">
{{ t('customColor') }}
</van-checkbox>
</demo-block>

View File

@@ -67,7 +67,7 @@ exports[`should render demo and match snapshot 1`] = `
>
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-badge__wrapper van-icon van-icon-success"
style="border-color: #07c160; background-color: rgb(7, 193, 96);"
style="border-color: #ee0a24; background-color: rgb(238, 10, 36);"
>
</i>
</div>