Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-07-04 21:10:44 +08:00
133 changed files with 4229 additions and 2769 deletions

View File

@@ -1,7 +1,10 @@
<template>
<div class="van-doc-demo-block">
<h2 class="van-doc-demo-block__title">{{ title }}</h2>
<slot />
<h2 v-if="title" class="van-doc-demo-block__title">{{ title }}</h2>
<div v-if="card" class="van-doc-demo-block__card">
<slot />
</div>
<slot v-else />
</div>
</template>
@@ -10,6 +13,7 @@ export default {
name: 'demo-block',
props: {
card: Boolean,
title: String,
},
};
@@ -28,6 +32,16 @@ export default {
line-height: 16px;
}
&__card {
margin: 12px 12px 0;
overflow: hidden;
border-radius: 8px;
}
&__title + &__card {
margin-top: 0;
}
&:first-of-type {
.van-doc-demo-block__title {
padding-top: 20px;