Merge branch 'yoona' into 'master'

Yoona See merge request pigbigbig/beyond-clouds-front!60

Merge branch 'yoona' into 'master'
Yoona See merge request pigbigbig/beyond-clouds-front!60
2ec6e92f · yanju · 3efcd4bd · 0a983cc2 · 2ec6e92f
Commit 2ec6e92f authored Feb 13, 2020 by yanju
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

pages/blog/index.vue
+4 -6

No files found.
--- a/pages/blog/index.vue
+++ b/pages/blog/index.vue
@@ -10,7 +10,6 @@
      <div class="blog-container__center">
        <card-container
          width="816px"
-          height="1012px"
          :title="labelTitle"
        >
@@ -25,20 +24,19 @@
      <div class="blog-container__right">
        <div class="right__write-blog" @click="toRelease">写文章</div>
        <card-container
+          v-if="false"
          title="热门博主"
          label="换一换"
          more="更多"
          width="302px"
-          height="446px"
+          style="margin-top: 16px;max-height: 446px;"
-          style="margin-top: 16px"
        >
          <user-card></user-card>
        </card-container>
        <card-container
          title="热门标签"
          width="302px"
-          height="446px"
+          style="margin-top: 16px;max-height: 446px;"
-          style="margin-top: 16px;"
        >
          <div class="tags-wrap">
            <div class="tag-box" v-for="(item, index) in hotTagsList" :key="item.tagId">
@@ -195,7 +193,7 @@ export default {
        }
      }
      .tags-wrap{
-        padding: 10*$length;
+        padding: 10*$length 10*$length 30*$length;
        .tag-box{
          display: inline-block;
          margin-right: 10*$length;