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/action-bar/README.md
+1 -1
View File
@@ -58,7 +58,7 @@ Use `badge` prop to show badge in icon.
```html
<van-action-bar>
<van-action-bar-icon icon="chat-o" text="Icon1" color="#07c160" />
<van-action-bar-icon icon="chat-o" text="Icon1" color="#ee0a24" />
<van-action-bar-icon icon="cart-o" text="Icon2" />
<van-action-bar-icon icon="star" text="Collected" color="#ff5000" />
<van-action-bar-button type="warning" text="Button" />
src/action-bar/README.zh-CN.md
+1 -1
View File
@@ -60,7 +60,7 @@ export default {
```html
<van-action-bar>
<van-action-bar-icon icon="chat-o" text="客服" color="#07c160" />
<van-action-bar-icon icon="chat-o" text="客服" color="#ee0a24" />
<van-action-bar-icon icon="cart-o" text="购物车" />
<van-action-bar-icon icon="star" text="已收藏" color="#ff5000" />
<van-action-bar-button type="warning" text="加入购物车" />
src/action-bar/demo/index.vue
+1 -1
View File
@@ -36,7 +36,7 @@
<demo-block v-if="!isWeapp" :title="t('customIconColor')">
<van-action-bar>
<van-action-bar-icon icon="chat-o" :text="t('icon1')" color="#07c160" />
<van-action-bar-icon icon="chat-o" :text="t('icon1')" color="#ee0a24" />
<van-action-bar-icon icon="cart-o" :text="t('icon2')" />
<van-action-bar-icon icon="star" :text="t('collected')" color="#ff5000" />
<van-action-bar-button type="warning" :text="t('button1')" />
src/action-bar/test/__snapshots__/demo.spec.js.snap
+3 -3
View File
@@ -99,7 +99,7 @@ exports[`should render demo and match snapshot 1`] = `
tabindex="0"
>
<div class="van-badge__wrapper van-icon van-icon-chat-o van-action-bar-icon__icon"
style="color: rgb(7, 193, 96);"
style="color: rgb(238, 10, 36);"
>
</div>
Icon1
@@ -162,7 +162,7 @@ exports[`should render demo and match snapshot 1`] = `
</div>
<button type="button"
class="van-button van-button--warning van-button--large van-action-bar-button van-action-bar-button--warning van-action-bar-button--first"
style="color: rgb(255, 255, 255); border-color: #be99ff; background: rgb(190, 153, 255);"
style="color: white; border-color: #be99ff; background: rgb(190, 153, 255);"
>
<div class="van-button__content">
<span class="van-button__text">
@@ -172,7 +172,7 @@ exports[`should render demo and match snapshot 1`] = `
</button>
<button type="button"
class="van-button van-button--danger van-button--large van-action-bar-button van-action-bar-button--danger van-action-bar-button--last"
style="color: rgb(255, 255, 255); background: rgb(114, 50, 221); border-color: #7232dd;"
style="color: white; background: rgb(114, 50, 221); border-color: #7232dd;"
>
<div class="van-button__content">
<span class="van-button__text">