Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -153,6 +153,9 @@ export default {

 | 名称                     | 默认值              | 描述 |
 | ------------------------ | ------------------- | ---- |
+| @circle-size             | `100px`             | -    |
+| @circle-color            | `@blue`             | -    |
+| @circle-layer-color      | `@white`            | -    |
 | @circle-text-color       | `@text-color`       | -    |
 | @circle-text-font-weight | `@font-weight-bold` | -    |
 | @circle-text-font-size   | `@font-size-md`     | -    |