Merge branch 'dev'

cadecode · Jul 31, 2020 · 39825b9 · 39825b9
2 parents 2d5049e + 06a835b
commit 39825b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/components/Catalog.vue b/components/Catalog.vue
@@ -61,11 +61,13 @@
                         for (let i = 0; i < len - 1; i++) {
                             if (scrollTop >= arr[i] && scrollTop < arr[i + 1]) {
                                 this.$tool.addClass(list[i], 'catalog-item-active')
+                                list[i].scrollIntoView()
                             } else {
                                 this.$tool.removeClass(list[i], 'catalog-item-active')
                             }
                             if (scrollTop >= arr[len - 1]) {
                                 this.$tool.addClass(list[len - 1], 'catalog-active')
+                                list[i].scrollIntoView()
                             } else {
                                 this.$tool.removeClass(list[len - 1], 'catalog-active')
                             }

diff --git a/layouts/Tag.vue b/layouts/Tag.vue
@@ -1,11 +1,5 @@
 <template>
     <div class="tag-container">
-        <el-row>
-            <el-col :xs="{span: 20, offset: 2}"
-                    :sm="{span: 18, offset: 3}"
-                    :md="{span: 16, offset: 4}"
-                    :lg="{span: 14, offset: 5}"
-                    :xl="{span: 12, offset: 6}">
                 <p class="tag-name">
                     <i class="el-icon-collection" />
                     {{tagName}}
@@ -38,8 +32,6 @@
                         </div>
                     </el-col>
                 </el-row>
-            </el-col>
-        </el-row>
     </div>
 </template>
 

diff --git a/styles/main.styl b/styles/main.styl
@@ -216,8 +216,8 @@
 
 // Tag.vue
 .tag-container
-  padding-top 60px
-  padding-bottom 20px
+  padding 60px 20px 20px
+  max-width 1000px
 
 .tag-name
   font-size 18px