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
+16 -3
View File
@@ -51,9 +51,7 @@ Use the image prop to display different placeholder images.
```html
<van-empty description="Description">
<van-button round type="danger" class="bottom-button">
Button
</van-button>
<van-button round type="danger" class="bottom-button"> Button </van-button>
</van-empty>
<style>
@@ -81,3 +79,18 @@ Use the image prop to display different placeholder images.
| default | Custom bottom content |
| image | Custom image |
| description | Custom description |
### Less Variables
How to use: [Custom Theme](#/en-US/theme).
| Name | Default Value | Description |
| ------------------------------ | ----------------- | ----------- |
| @empty-padding | `@padding-xl 0` | - |
| @empty-image-size | `160px` | - |
| @empty-description-margin-top | `@padding-md` | - |
| @empty-description-padding | `0 60px` | - |
| @empty-description-color | `@gray-6` | - |
| @empty-description-font-size | `@font-size-md` | - |
| @empty-description-line-height | `@line-height-md` | - |
| @empty-bottom-margin-top | `24px` | - |
+16 -3
View File
@@ -60,9 +60,7 @@ Empty 组件内置了多种占位图片类型,可以在不同业务场景下
```html
<van-empty description="描述文字">
<van-button round type="danger" class="bottom-button">
按钮
</van-button>
<van-button round type="danger" class="bottom-button"> 按钮 </van-button>
</van-empty>
<style>
@@ -90,3 +88,18 @@ Empty 组件内置了多种占位图片类型,可以在不同业务场景下
| default | 自定义底部内容 |
| image | 自定义图标 |
| description | 自定义描述文字 |
### 样式变量
组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。
| 名称 | 默认值 | 描述 |
| ------------------------------ | ----------------- | ---- |
| @empty-padding | `@padding-xl 0` | - |
| @empty-image-size | `160px` | - |
| @empty-description-margin-top | `@padding-md` | - |
| @empty-description-padding | `0 60px` | - |
| @empty-description-color | `@gray-6` | - |
| @empty-description-font-size | `@font-size-md` | - |
| @empty-description-line-height | `@line-height-md` | - |
| @empty-bottom-margin-top | `24px` | - |