Skip to content

官美宏 / aiqiyi-program

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 7f20cf2b 7f20cf2b85d33e8573fc8b63569a190dd88bd752 by 官美宏
Options

Merge branch 'dev' of 139.196.37.202:guan.meihong/aiqiyi-program into dev

2 parents f9490e6d 12177c62
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
47 } 47 }
48 48
49 .fixed-header+.app-main { 49 .fixed-header+.app-main {
50 padding-top: 50px; 50 padding-top: 84px;
51 } 51 }
52 } 52 }
53 </style> 53 </style>
......
...@@ -193,8 +193,8 @@ export default { ...@@ -193,8 +193,8 @@ export default {
193 193
194 <style lang="scss" scoped> 194 <style lang="scss" scoped>
195 .tags-view-container { 195 .tags-view-container {
196 //height: 34px; 196 height: 34px;
197 height: 0px; 197 //height: 0px;
198 width: 100%; 198 width: 100%;
199 background: #fff; 199 background: #fff;
200 border-bottom: 1px solid #d8dce5; 200 border-bottom: 1px solid #d8dce5;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <div :class="{'fixed-header':fixedHeader}"> 6 <div :class="{'fixed-header':fixedHeader}">
7 <navbar /> 7 <navbar />
8 <!-- <tags-view v-if="needTagsView" />--> 8 <!-- <tags-view v-if="needTagsView" />-->
9 <tags-view v-if="false" /> 9 <tags-view v-if="needTagsView" />
10 </div> 10 </div>
11 <app-main /> 11 <app-main />
12 <right-panel v-if="showSettings"> 12 <right-panel v-if="showSettings">
......