blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(Toast): add @toast-loading-icon-color var (#4782)

Browse Source
This commit is contained in:
neverland 2019-10-19 16:20:05 +08:00 committed by GitHub
parent 1e21ce3cc0
commit 878b330431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/style/var.less
View File

@ -665,6 +665,7 @@
@toast-max-width: 70%; @toast-max-width: 70%;
@toast-font-size: @font-size-md; @toast-font-size: @font-size-md;
@toast-text-color: @white; @toast-text-color: @white;
@toast-loading-icon-color: @white;
@toast-line-height: 20px; @toast-line-height: 20px;
@toast-border-radius: @border-radius-md; @toast-border-radius: @border-radius-md;
@toast-background-color: rgba(@text-color, .88); @toast-background-color: rgba(@text-color, .88);

4
src/toast/README.md
View File

@ -21,8 +21,8 @@ Toast('Some messages');
```javascript ```javascript
Toast.loading({ Toast.loading({
mask: true, message: 'Loading...',
message: 'Loading...' forbidClick: true
}); });
``` ```

4
src/toast/README.zh-CN.md
View File

@ -21,8 +21,8 @@ Toast('提示内容');
```js ```js
Toast.loading({ Toast.loading({
mask: true, message: '加载中...',
message: '加载中...' forbidClick: true
}); });
``` ```

2
src/toast/Toast.js
View File

@ -95,7 +95,7 @@ export default createComponent({
} }
if (type === 'loading') { if (type === 'loading') {
return <Loading class={bem('loading')} color="white" type={loadingType} />; return <Loading class={bem('loading')} type={loadingType} />;
} }
} }

2
src/toast/demo/index.vue
View File

@ -106,7 +106,7 @@ export default {
methods: { methods: {
showLoadingToast() { showLoadingToast() {
this.$toast.loading({ mask: true, message: this.$t('loading') }); this.$toast.loading({ forbidClick: true, message: this.$t('loading') });
}, },
showSuccessToast() { showSuccessToast() {

4
src/toast/index.less
View File

@ -61,6 +61,10 @@
&__loading { &__loading {
padding: @padding-base; padding: @padding-base;
.van-loading__spinner {
color: @toast-loading-icon-color;
}
} }
&__text { &__text {

2
src/toast/test/__snapshots__/index.spec.js.snap
View File

@ -29,7 +29,7 @@ exports[`show html toast 1`] = `
exports[`show loading toast 1`] = ` exports[`show loading toast 1`] = `
<div class="van-toast van-toast--middle" style="z-index: 2003;" name="van-fade"> <div class="van-toast van-toast--middle" style="z-index: 2003;" name="van-fade">
<div class="van-loading van-loading--circular van-toast__loading"><span class="van-loading__spinner van-loading__spinner--circular" style="color: white;"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div> <div class="van-loading van-loading--circular van-toast__loading"><span class="van-loading__spinner van-loading__spinner--circular"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
<div class="van-toast__text">Message</div> <div class="van-toast__text">Message</div>
</div> </div>
`; `;