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

feat(Skeleton): add @skeleton-avatar-size less var (#7556)

Browse Source
This commit is contained in:
neverland 2020-11-15 08:52:50 +08:00 committed by GitHub
parent 810c3a7919
commit 3f4e0a04c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/skeleton/index.less
View File

@ -6,6 +6,8 @@
&__avatar { &__avatar {
flex-shrink: 0; flex-shrink: 0;
width: @skeleton-avatar-size;
height: @skeleton-avatar-size;
margin-right: @padding-md; margin-right: @padding-md;
background-color: @skeleton-avatar-background-color; background-color: @skeleton-avatar-background-color;

5
src/skeleton/index.tsx
View File

@ -96,6 +96,7 @@ Skeleton.props = {
title: Boolean, title: Boolean,
round: Boolean, round: Boolean,
avatar: Boolean, avatar: Boolean,
avatarSize: [Number, String],
row: { row: {
type: [Number, String], type: [Number, String],
default: 0, default: 0,
@ -108,10 +109,6 @@ Skeleton.props = {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
avatarSize: {
type: [Number, String],
default: '32px',
},
avatarShape: { avatarShape: {
type: String, type: String,
default: 'round', default: 'round',

4
src/skeleton/test/__snapshots__/demo.spec.js.snap
View File

@ -14,7 +14,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
<div> <div>
<div class="van-skeleton van-skeleton--animate"> <div class="van-skeleton van-skeleton--animate">
<div class="van-skeleton__avatar van-skeleton__avatar--round" style="width: 32px; height: 32px;"></div> <div class="van-skeleton__avatar van-skeleton__avatar--round"></div>
<div class="van-skeleton__content"> <div class="van-skeleton__content">
<h3 class="van-skeleton__title" style="width: 40%;"></h3> <h3 class="van-skeleton__title" style="width: 40%;"></h3>
<div class="van-skeleton__row" style="width: 100%;"></div> <div class="van-skeleton__row" style="width: 100%;"></div>
@ -28,7 +28,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-switch__node"></div> <div class="van-switch__node"></div>
</div> </div>
<div class="van-skeleton van-skeleton--animate"> <div class="van-skeleton van-skeleton--animate">
<div class="van-skeleton__avatar van-skeleton__avatar--round" style="width: 32px; height: 32px;"></div> <div class="van-skeleton__avatar van-skeleton__avatar--round"></div>
<div class="van-skeleton__content"> <div class="van-skeleton__content">
<h3 class="van-skeleton__title" style="width: 40%;"></h3> <h3 class="van-skeleton__title" style="width: 40%;"></h3>
<div class="van-skeleton__row" style="width: 100%;"></div> <div class="van-skeleton__row" style="width: 100%;"></div>

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

@ -19,7 +19,7 @@ exports[`render chidren 1`] = `<div>Content</div>`;
exports[`round prop 1`] = ` exports[`round prop 1`] = `
<div class="van-skeleton van-skeleton--animate van-skeleton--round"> <div class="van-skeleton van-skeleton--animate van-skeleton--round">
<div class="van-skeleton__avatar van-skeleton__avatar--round" style="width: 32px; height: 32px;"></div> <div class="van-skeleton__avatar van-skeleton__avatar--round"></div>
<div class="van-skeleton__content"> <div class="van-skeleton__content">
<h3 class="van-skeleton__title" style="width: 40%;"></h3> <h3 class="van-skeleton__title" style="width: 40%;"></h3>
</div> </div>

1
src/style/var.less
View File

@ -648,6 +648,7 @@
@skeleton-row-height: 16px; @skeleton-row-height: 16px;
@skeleton-row-background-color: @active-color; @skeleton-row-background-color: @active-color;
@skeleton-row-margin-top: @padding-sm; @skeleton-row-margin-top: @padding-sm;
@skeleton-avatar-size: 32px;
@skeleton-avatar-background-color: @active-color; @skeleton-avatar-background-color: @active-color;
@skeleton-animation-duration: 1.2s; @skeleton-animation-duration: 1.2s;