Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-22 16:06:24 +08:00
123 changed files with 2400 additions and 95 deletions

View File

@@ -141,3 +141,39 @@ app.use(Button);
| ----------------- | ------------------- |
| default | Default slot |
| loading `v2.10.1` | Custom loading icon |
### Less Variables
How to use: [Custom Theme](#/en-US/theme).
| Name | Default Value | Description |
| -------------------------------- | -------------------- | ----------- |
| @button-mini-height | `24px` | - |
| @button-mini-font-size | `@font-size-xs` | - |
| @button-small-height | `32px` | - |
| @button-small-font-size | `@font-size-sm` | - |
| @button-normal-font-size | `@font-size-md` | - |
| @button-large-height | `50px` | - |
| @button-default-height | `44px` | - |
| @button-default-line-height | `1.2` | - |
| @button-default-font-size | `@font-size-lg` | - |
| @button-default-color | `@text-color` | - |
| @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-danger-color | `@white` | - |
| @button-danger-background-color | `@red` | - |
| @button-danger-border-color | `@red` | - |
| @button-warning-color | `@white` | - |
| @button-warning-background-color | `@orange` | - |
| @button-warning-border-color | `@orange` | - |
| @button-border-width | `@border-width-base` | - |
| @button-border-radius | `@border-radius-sm` | - |
| @button-round-border-radius | `@border-radius-max` | - |
| @button-plain-background-color | `@white` | - |
| @button-disabled-opacity | `@disabled-opacity` | - |

View File

@@ -168,3 +168,39 @@ app.use(Button);
| ----------------- | -------------- |
| default | 按钮内容 |
| loading `v2.10.1` | 自定义加载图标 |
### 样式变量
组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。
| 名称 | 默认值 | 描述 |
| -------------------------------- | -------------------- | ---- |
| @button-mini-height | `24px` | - |
| @button-mini-font-size | `@font-size-xs` | - |
| @button-small-height | `32px` | - |
| @button-small-font-size | `@font-size-sm` | - |
| @button-normal-font-size | `@font-size-md` | - |
| @button-large-height | `50px` | - |
| @button-default-height | `44px` | - |
| @button-default-line-height | `1.2` | - |
| @button-default-font-size | `@font-size-lg` | - |
| @button-default-color | `@text-color` | - |
| @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-danger-color | `@white` | - |
| @button-danger-background-color | `@red` | - |
| @button-danger-border-color | `@red` | - |
| @button-warning-color | `@white` | - |
| @button-warning-background-color | `@orange` | - |
| @button-warning-border-color | `@orange` | - |
| @button-border-width | `@border-width-base` | - |
| @button-border-radius | `@border-radius-sm` | - |
| @button-round-border-radius | `@border-radius-max` | - |
| @button-plain-background-color | `@white` | - |
| @button-disabled-opacity | `@disabled-opacity` | - |