alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabbar/README.md
+1 -1
View File
@@ -100,7 +100,7 @@ export default {
### Custom Color
```html
<van-tabbar v-model="active" active-color="#07c160" inactive-color="#000">
<van-tabbar v-model="active" active-color="#ee0a24" inactive-color="#000">
<van-tabbar-item icon="home-o">Tab</van-tabbar-item>
<van-tabbar-item icon="search">Tab</van-tabbar-item>
<van-tabbar-item icon="friends-o">Tab</van-tabbar-item>
src/tabbar/README.zh-CN.md
+1 -1
View File
@@ -106,7 +106,7 @@ export default {
### 自定义颜色
```html
<van-tabbar v-model="active" active-color="#07c160" inactive-color="#000">
<van-tabbar v-model="active" active-color="#ee0a24" inactive-color="#000">
<van-tabbar-item icon="home-o">标签</van-tabbar-item>
<van-tabbar-item icon="search">标签</van-tabbar-item>
<van-tabbar-item icon="friends-o">标签</van-tabbar-item>
src/tabbar/demo/index.vue
+1 -1
View File
@@ -52,7 +52,7 @@
</demo-block>
<demo-block :title="t('customColor')">
<van-tabbar v-model="active4" active-color="#07c160" inactive-color="#000">
<van-tabbar v-model="active4" active-color="#ee0a24" inactive-color="#000">
<van-tabbar-item icon="home-o">{{ t('tab') }}</van-tabbar-item>
<van-tabbar-item icon="search">{{ t('tab') }}</van-tabbar-item>
<van-tabbar-item icon="friends-o">{{ t('tab') }}</van-tabbar-item>
src/tabbar/test/__snapshots__/demo.spec.js.snap
+1 -1
View File
@@ -167,7 +167,7 @@ exports[`should render demo and match snapshot 1`] = `
<div>
<div class="van-tabbar van-tabbar--fixed van-hairline--top-bottom">
<div class="van-tabbar-item van-tabbar-item--active"
style="color: rgb(7, 193, 96);"
style="color: rgb(238, 10, 36);"
>
<div class="van-badge__wrapper van-tabbar-item__icon">
<i class="van-badge__wrapper van-icon van-icon-home-o">