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
@@ -137,12 +137,8 @@ export default {
 <router-view />

 <van-tabbar route>
-  <van-tabbar-item replace to="/home" icon="home-o">
-    Tab
-  </van-tabbar-item>
-  <van-tabbar-item replace to="/search" icon="search">
-    Tab
-  </van-tabbar-item>
+  <van-tabbar-item replace to="/home" icon="home-o"> Tab </van-tabbar-item>
+  <van-tabbar-item replace to="/search" icon="search"> Tab </van-tabbar-item>
 </van-tabbar>
 ```

@@ -187,3 +183,20 @@ export default {
 | Name | Description | SlotProps |
 | ---- | ----------- | --------- |
 | icon | Custom icon | active    |
+
+### Less Variables
+
+How to use: [Custom Theme](#/en-US/theme).
+
+| Name | Default Value | Description |
+| --- | --- | --- |
+| @tabbar-height | `50px` | - |
+| @tabbar-z-index | `1` | - |
+| @tabbar-background-color | `@white` | - |
+| @tabbar-item-font-size | `@font-size-sm` | - |
+| @tabbar-item-text-color | `@gray-7` | - |
+| @tabbar-item-active-color | `@blue` | - |
+| @tabbar-item-active-background-color | `@tabbar-background-color` | - |
+| @tabbar-item-line-height | `1` | - |
+| @tabbar-item-icon-size | `22px` | - |
+| @tabbar-item-margin-bottom | `4px` | - |
@@ -145,12 +145,8 @@ export default {
 <router-view />

 <van-tabbar route>
-  <van-tabbar-item replace to="/home" icon="home-o">
-    标签
-  </van-tabbar-item>
-  <van-tabbar-item replace to="/search" icon="search">
-    标签
-  </van-tabbar-item>
+  <van-tabbar-item replace to="/home" icon="home-o"> 标签 </van-tabbar-item>
+  <van-tabbar-item replace to="/search" icon="search"> 标签 </van-tabbar-item>
 </van-tabbar>
 ```

@@ -195,3 +191,20 @@ export default {
 | 名称 | 说明       | 参数                   |
 | ---- | ---------- | ---------------------- |
 | icon | 自定义图标 | active: 是否为选中标签 |
+
+### 样式变量
+
+组件提供了下列 Less 变量，可用于自定义样式，使用方法请参考[主题定制](#/zh-CN/theme)。
+
+| 名称                                 | 默认值                     | 描述 |
+| ------------------------------------ | -------------------------- | ---- |
+| @tabbar-height                       | `50px`                     | -    |
+| @tabbar-z-index                      | `1`                        | -    |
+| @tabbar-background-color             | `@white`                   | -    |
+| @tabbar-item-font-size               | `@font-size-sm`            | -    |
+| @tabbar-item-text-color              | `@gray-7`                  | -    |
+| @tabbar-item-active-color            | `@blue`                    | -    |
+| @tabbar-item-active-background-color | `@tabbar-background-color` | -    |
+| @tabbar-item-line-height             | `1`                        | -    |
+| @tabbar-item-icon-size               | `22px`                     | -    |
+| @tabbar-item-margin-bottom           | `4px`                      | -    |