fixed nuxt height bug

src/dashoo.cn/frontend_web/src/layouts/default.vue

@@ -5,7 +5,7 @@
 	<section class="main">
       <sidebar></sidebar>
       <main class="content">
-        <nuxt class="inner"></nuxt>
+        <nuxt class="inner" style="height: calc(100vh - 90px);"></nuxt>
       </main>
     </section>
     <div>
@@ -18,7 +18,7 @@
     </div>
 	</div>
 </template>
-3
+
 <script>
 import { mapGetters } from 'vuex'
 // import Navbar from '@/components/Navbar'

src/dashoo.cn/frontend_web/src/layouts/site.vue

@@ -1,5 +1,5 @@
 <template>
-  <nuxt  style="height: 100%; background-color: #EEF1F6;"></nuxt>
+  <nuxt style="height: 100%; background-color: #EEF1F6;"></nuxt>
 </template>
 
 <script>

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -165,56 +165,47 @@ export default {
 }
 </script>
 
-<style scoped>
-.components-container div {
-  margin: 10px;
-}
-
-.time-container {
-  display: inline-block;
-}
-
-.top-wrapper {
-  margin: 0px auto;
-  width: 1400px;
-  /*text-align: right;
-  alignment: right;*/
-  flex-direction: row;
-}
-.home-wrapper{
-  margin:0px auto;
-  width: 1400px;
-  display: flex;
-  alignment: center;
-  align-items: center;
-  flex-direction: column;
-}
-
-@import '../assets/styles/base/variables';
+<style lang="scss" scoped>
+  @import '../assets/styles/base/variables';
 
-.back-width1 {
-  background-color: #2F79F6;
-  margin: 0px auto;
-  left: 0;
-  right: 0;
-  top: 20px;
-  width: 1400px;
-}
+  .components-container div {
+    margin: 10px;
+  }
 
+  .top-wrapper {
+    margin: 0px auto;
+    width: 1400px;
+    /*text-align: right;
+    alignment: right;*/
+    flex-direction: row;
+  }
+  .home-wrapper{
+    margin:0px auto;
+    width: 1400px;
+    display: flex;
+    alignment: center;
+    align-items: center;
+    flex-direction: column;
+  }
 
-.login-footer1 {
-  background-color: #34393D;
-  font-size: 10px;
-  clear: both;
-  display: block;
-  text-align: center;
-  margin: 0px auto;
-  bottom: 10px;
-  width: 100%;
-  a {
-    color: $brand-color;
+  .back-width1 {
+    background-color: #2F79F6;
+    margin: 0px auto;
+    left: 0;
+    right: 0;
+    top: 20px;
+    width: 1400px;
   }
-}
 
 
+  .login-footer1 {
+    background-color: #34393D;
+    font-size: 10px;
+    clear: both;
+    display: block;
+    text-align: center;
+    margin: 0px auto;
+    bottom: 10px;
+    width: 100%;
+  }
 </style>

src/dashoo.cn/frontend_web/src/pages/logingf.vue

@@ -107,7 +107,7 @@
 
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   @import '../assets/styles/base/variables';
 
   .back-width {
@@ -216,8 +216,8 @@
 
   }
 
-  .nuxt-progress {
+  /*.nuxt-progress {
     display: none;
-  }
+  }*/
 
 </style>