diff --git a/docs/markdown/migrate-from-v2.zh-CN.md b/docs/markdown/migrate-from-v2.zh-CN.md index 4c94eca9e..c8daa6b62 100644 --- a/docs/markdown/migrate-from-v2.zh-CN.md +++ b/docs/markdown/migrate-from-v2.zh-CN.md @@ -93,6 +93,8 @@ GoodsAction 商品导航组件重命名为 **ActionBar 行动栏**。 ### API 调整 - Area: 移除 change 事件的第一个参数（picker 实例） +- Button: 蓝色按钮对应的类型由 `info` 调整为 `primary` +- Button: 绿色按钮对应的类型由 `primary` 调整为 `success` - Picker: 移除 change 事件的第一个参数（picker 实例） - Picker: 默认开启 show-toolbar 属性 - Picker: 级联选择下，confirm/change 事件返回的回调参数将包含为完整的选项对象。 diff --git a/src/button/README.md b/src/button/README.md index a3333db12..cab9a35fd 100644 --- a/src/button/README.md +++ b/src/button/README.md @@ -16,7 +16,7 @@ app.use(Button); ```html Primary -Info +Success Default Danger Warning @@ -26,21 +26,21 @@ app.use(Button); ```html Primary -Danger +Danger ``` ### Hairline ```html Hairline -Hairline +Hairline ``` ### Disabled ```html Diabled -Diabled +Diabled ``` ### Loading @@ -48,14 +48,14 @@ app.use(Button); ```html - + ``` ### Shape ```html Square -Round +Round ``` ### Icon @@ -63,7 +63,7 @@ app.use(Button); ```html Button - + Button ``` @@ -106,7 +106,7 @@ app.use(Button); | Attribute | Description | Type | Default | | --- | --- | --- | --- | -| type | Can be set to `primary` `info` `warning` `danger` | _string_ | `default` | +| type | Can be set to `primary` `success` `warning` `danger` | _string_ | `default` | | size | Can be set to `large` `small` `mini` | _string_ | `normal` | | text | Text | _string_ | - | | color `v2.1.8` | Color, support linear-gradient | _string_ | - | diff --git a/src/button/README.zh-CN.md b/src/button/README.zh-CN.md index d8958cd07..cc3f0aaa5 100644 --- a/src/button/README.zh-CN.md +++ b/src/button/README.zh-CN.md @@ -14,11 +14,11 @@ app.use(Button); ### 按钮类型 -按钮支持 `default`、`primary`、`info`、`warning`、`danger` 五种类型，默认为 `default`。 +按钮支持 `default`、`primary`、`success`、`warning`、`danger` 五种类型，默认为 `default`。 ```html 主要按钮 -信息按钮 +成功按钮 默认按钮 警告按钮 危险按钮 @@ -30,7 +30,7 @@ app.use(Button); ```html 朴素按钮 -朴素按钮 +朴素按钮 ``` ### 细边框 @@ -39,7 +39,7 @@ app.use(Button); ```html 细边框按钮 -细边框按钮 +细边框按钮 ``` ### 禁用状态 @@ -48,7 +48,7 @@ app.use(Button); ```html 禁用状态 -禁用状态 +禁用状态 ``` ### 加载状态 @@ -58,7 +58,7 @@ app.use(Button); ```html - + ``` ### 按钮形状 @@ -67,7 +67,7 @@ app.use(Button); ```html 方形按钮 -圆形按钮 +圆形按钮 ``` ### 图标按钮 @@ -77,7 +77,7 @@ app.use(Button); ```html 按钮 - + 按钮 ``` @@ -128,7 +128,7 @@ app.use(Button); | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| type | 类型，可选值为 `primary` `info` `warning` `danger` | _string_ | `default` | +| type | 类型，可选值为 `primary` `success` `warning` `danger` | _string_ | `default` | | size | 尺寸，可选值为 `large` `small` `mini` | _string_ | `normal` | | text | 按钮文字 | _string_ | - | | color `v2.1.8` | 按钮颜色，支持传入`linear-gradient`渐变色 | _string_ | - | diff --git a/src/button/demo/index.vue b/src/button/demo/index.vue index befe6c9b4..7e44aab2c 100644 --- a/src/button/demo/index.vue +++ b/src/button/demo/index.vue @@ -3,7 +3,7 @@
{{ t('primary') }} - {{ t('info') }} + {{ t('success') }} {{ t('default') }}
{{ t('danger') }} @@ -12,28 +12,28 @@ - + - + - + - + - + @@ -41,7 +41,7 @@ @@ -89,7 +89,7 @@ export default { shape: '按钮形状', default: '默认按钮', primary: '主要按钮', - info: '信息按钮', + success: '成功按钮', danger: '危险按钮', warning: '警告按钮', large: '大号按钮', @@ -118,7 +118,7 @@ export default { shape: 'Shape', default: 'Default', primary: 'Primary', - info: 'Info', + success: 'Success', danger: 'Danger', warning: 'Warning', large: 'Large', diff --git a/src/button/index.less b/src/button/index.less index 5f2ad00ae..ef1de2b14 100644 --- a/src/button/index.less +++ b/src/button/index.less @@ -53,10 +53,10 @@ border: @button-border-width solid @button-primary-border-color; } - &--info { - color: @button-info-color; - background-color: @button-info-background-color; - border: @button-border-width solid @button-info-border-color; + &--success { + color: @button-success-color; + background-color: @button-success-background-color; + border: @button-border-width solid @button-success-border-color; } &--danger { @@ -78,8 +78,8 @@ color: @button-primary-background-color; } - &.van-button--info { - color: @button-info-background-color; + &.van-button--success { + color: @button-success-background-color; } &.van-button--danger { diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 01196a838..289f20d3d 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -150,7 +150,7 @@ export default { Check All -Toggle All +Toggle All ``` ```js diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index 4a0501c50..25b1919ab 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -168,7 +168,7 @@ export default { 全选 -反选 +反选 ``` ```js diff --git a/src/checkbox/demo/index.vue b/src/checkbox/demo/index.vue index aee4d571b..4afdc48e8 100644 --- a/src/checkbox/demo/index.vue +++ b/src/checkbox/demo/index.vue @@ -79,7 +79,7 @@ {{ t('checkAll') }} - + {{ t('inverse') }} diff --git a/src/form/README.md b/src/form/README.md index 67fe58b95..f833d4bc1 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -32,7 +32,7 @@ app.use(Form); :rules="[{ required: true, message: 'Password is required' }]" />
- + Submit
@@ -78,7 +78,7 @@ export default { :rules="[{ validator: asyncValidator, message: 'Error message' }]" />
- + Submit
diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index 4aae60114..2027b5b3b 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -38,7 +38,7 @@ app.use(Form); :rules="[{ required: true, message: '请填写密码' }]" />
- + 提交
@@ -89,7 +89,7 @@ export default { :rules="[{ validator: asyncValidator, message: '请输入正确内容' }]" />
- + 提交
diff --git a/src/form/demo/BasicUsage.vue b/src/form/demo/BasicUsage.vue index a951291d4..1e1588774 100644 --- a/src/form/demo/BasicUsage.vue +++ b/src/form/demo/BasicUsage.vue @@ -17,7 +17,7 @@ :placeholder="t('password')" />
- + {{ t('submit') }}
diff --git a/src/form/demo/FieldType.vue b/src/form/demo/FieldType.vue index 4cb694a87..01454a82c 100644 --- a/src/form/demo/FieldType.vue +++ b/src/form/demo/FieldType.vue @@ -65,7 +65,7 @@
- + {{ t('submit') }}
diff --git a/src/form/demo/ValidateRules.vue b/src/form/demo/ValidateRules.vue index ceddd65b4..a17a3a91f 100644 --- a/src/form/demo/ValidateRules.vue +++ b/src/form/demo/ValidateRules.vue @@ -23,7 +23,7 @@ :placeholder="t('asyncValidator')" />
- + {{ t('submit') }}
diff --git a/src/number-keyboard/README.md b/src/number-keyboard/README.md index d42198be5..7da413df3 100644 --- a/src/number-keyboard/README.md +++ b/src/number-keyboard/README.md @@ -84,7 +84,7 @@ Use `extra-key` prop to set the content of bottom left button Use `title` prop to set keyboard title ```html - + Show Keyboard With Title + 弹出带标题的键盘 - Offset Top + Offset Top ``` diff --git a/src/sticky/README.zh-CN.md b/src/sticky/README.zh-CN.md index 153992369..85e7afcb3 100644 --- a/src/sticky/README.zh-CN.md +++ b/src/sticky/README.zh-CN.md @@ -32,7 +32,7 @@ app.use(Sticky); ```html - 吸顶距离 + 吸顶距离 ``` diff --git a/src/sticky/demo/index.vue b/src/sticky/demo/index.vue index e7f1234a6..0aacd6bab 100644 --- a/src/sticky/demo/index.vue +++ b/src/sticky/demo/index.vue @@ -10,7 +10,7 @@ - + {{ t('offsetTop') }} diff --git a/src/style/var.less b/src/style/var.less index 5970fd170..4b410141c 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -139,11 +139,11 @@ @button-default-background-color: @white; @button-default-border-color: @border-color; @button-primary-color: @white; -@button-primary-background-color: @green; -@button-primary-border-color: @green; -@button-info-color: @white; -@button-info-background-color: @blue; -@button-info-border-color: @blue; +@button-primary-background-color: @blue; +@button-primary-border-color: @blue; +@button-success-color: @white; +@button-success-background-color: @green; +@button-success-border-color: @green; @button-danger-color: @white; @button-danger-background-color: @red; @button-danger-border-color: @red;