戴艳蓉 3 lat temu
rodzic
commit
b874f96ee3

+ 16 - 20
src/layout/components/AppMain.vue

@@ -1,11 +1,11 @@
 <template>
-  <section class="app-main">
+  <div   class="app-main">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view :key="key" />
       </keep-alive>
     </transition>
-  </section>
+  </div>
 </template>
 
 <script>
@@ -32,47 +32,43 @@ export default {
 @import "~@/styles/sidebar.scss";
 @import "~@/styles/btn.scss";
 .app-main {
-  /* 50= navbar  50  */
+  // min-height: calc(100vh - 50px);
   min-height: 100%;
   //calc(100vh - 50px);
   width: 100%;
   height: 100%;
-  position: relative;
-  overflow: scroll;
-  padding: 0 0 0 0;
+  position: fixed;
+  // overflow: scroll;
+  padding: 50px 0 0 0;
   box-sizing: border-box;
-  @include scrollBar();
+  // @include scrollBar();
 }
 
 .fixed-header + .app-main {
-  
   // min-height: calc(100vh - 50px);
   min-height: 100%;
   //calc(100vh - 50px);
   width: 100%;
   height: 100%;
-  position: relative;
-  overflow: scroll;
-  padding: 0 0 0 0;
-  padding-top: 50px;
+  position: fixed;
+  // overflow: scroll;
+  padding: 50px 0 0 0;
   box-sizing: border-box;
-  @include scrollBar();
+  // @include scrollBar();
 }
 
 .hasTagsView {
   .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: 100%;
+    // min-height: calc(100vh - 50px);
     min-height: 100%;
     //calc(100vh - 50px);
     width: 100%;
     height: 100%;
-    position: relative;
-    overflow: scroll;
-    padding: 0 0 0 0;
+    position: fixed;
+    // overflow: scroll;
+    padding: 50px 0 0 0;
     box-sizing: border-box;
-    padding-top: 50px;
-    @include scrollBar();
+    // @include scrollBar();
   }
 
   // .fixed-header+.app-main {

+ 2 - 1
src/styles/sidebar.scss

@@ -4,7 +4,8 @@
     height: 100%;
     transition: margin-left 0.28s;
     margin-left: $sideBarWidth;
-    position: relative;
+    position: fixed;
+    min-height: 100%;;
     min-width: calc( 1200px - 200px);
   }
 

+ 7 - 2
src/views/dashboard/index.vue

@@ -36,6 +36,11 @@ export default {
 .dashboard-container {
   // background-color: #f0f4fd;
   padding: 0 0 0 0;
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+  display: inline-block;
+  background-color: #e3e3e3;
 }
 .emptyGif {
   display: block;
@@ -44,8 +49,8 @@ export default {
 }
 
 .dashboard-editor-container {
-  background-color: #e3e3e3;
-  min-height: calc(100vh - 84px);
+   position: relative;
+  min-height:100%;
   width: 100%;
   // display: flex;
   padding: 0 6% 0 0;