Merge branch 'dev'

FEMessage · Mar 24, 2020 · d817ece · d817ece
2 parents 2e754ac + 7ddbcc5
commit d817ece
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,12 +23,12 @@ cache:
     - release/nuxt-admin/node_modules
     - release/nuxt-vant/node_modules
 deploy:
-  #- provider: pages
-  #  skip_cleanup: true
-  #  github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
-  #  local-dir: dist
-  #  on:
-  #    branch: master
+  - provider: pages
+    skip_cleanup: true
+    github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
+    local-dir: dist
+    on:
+      branch: master
   - provider: script
     skip_cleanup: true
     script: npx semantic-release

diff --git a/template/framework-admin/layouts/default.vue b/template/framework-admin/layouts/default.vue
@@ -15,18 +15,18 @@
 
     <section class="sub-container">
       <sidebar :menu-list="sideMenu" class="nav"></sidebar>
-      <section class="main-content scroller-vertical">
+      <section class="main-content">
         <bread-crumb />
-        <el-scrollbar wrap-class="scrollbar-wrapper">
-          <section class="sub-content">
+        <section class="sub-content">
+          <el-scrollbar wrap-class="scrollbar-wrapper">
             <section class="content">
               <nuxt />
             </section>
             <el-footer :height="FOOTER_HEIGHT">
               <copyright></copyright>
             </el-footer>
-          </section>
-        </el-scrollbar>
+          </el-scrollbar>
+        </section>
       </section>
     </section>
   </section>
@@ -97,14 +97,18 @@ export default {
   .main-content {
     flex: 1;
     width: calc(100vw - @sidebar-width);
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
   }
 
   .sub-content {
-    width: calc(100vw - @sidebar-width);
     height: calc(100vh - @--header-height - @--breadcrumb-height);
+    overflow: hidden;
   }
 
   .content {
+    box-sizing: border-box;
     padding: 20px;
     margin: 0 20px;
     min-height: calc(

diff --git a/template/modules/styles-desktop/assets/global.less b/template/modules/styles-desktop/assets/global.less
@@ -84,7 +84,6 @@ a {
     .scrollbar-wrapper {
       overflow-x: hidden;
       overflow-y: auto;
-      height: unset;
     }
   }
 }