Merge branch 'dev' into next

2020-08-07 06:33:04 +08:00
parent 49206598fc db94fa3193
commit 17c64b24e7
84 changed files with 898 additions and 345 deletions
@@ -1,6 +1,6 @@
 <template>
  <demo-section>
-    <van-tabs v-model="tab" sticky :color="BLUE">
+    <van-tabs v-model="tab" sticky>
      <van-tab :title="t('demo')">
        <demo-block :title="t('basicUsage')">
          <van-col span="6" @click="copy(demoIcon)">
@@ -3,7 +3,6 @@

 .van-icon {
  &__image {
-    display: block;
    width: 1em;
    height: 1em;
    object-fit: contain;