Merge branch '2.x' into dev

2020-11-22 16:06:24 +08:00
parent 2484329bf9 a77c620628
commit 8ce14496f5
123 changed files with 2400 additions and 95 deletions
@@ -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`            | -           |