Browse Source

去掉media查询

GuoYuFu123 5 years ago
parent
commit
522adce592
2 changed files with 49 additions and 49 deletions
  1. 2 2
      src/framework/layout/Main.vue
  2. 47 47
      src/framework/style/layout.scss

+ 2 - 2
src/framework/layout/Main.vue

@@ -62,8 +62,8 @@ export default {
         // console.log(this.$store.getters.flag)
     },
     mounted() {
-        this.windwoResize()
-        window.onresize = this.windwoResize
+        // this.windwoResize()
+        // window.onresize = this.windwoResize
     }
 }
 </script>

+ 47 - 47
src/framework/style/layout.scss

@@ -89,7 +89,7 @@ body {
             }
         }
         .menu-toggler.sidebar-toggler {
-            margin: 15.5px 0 0;
+            margin-top: 10.5px;
         }
     }
     .data-menu {
@@ -309,52 +309,52 @@ body {
     }
 }
 
-@media screen and (max-width: 1000px) {
-    #page-main {
-        .page-header {
-            .page-logo {
-                padding-left: 20px;
-                padding-right: 20px;
-                width: 20px;
-                > a {
-                    display: none;
-                }
-            }
-        }
-        .page-container {
-            .page-sidebar-wrapper {
-                width: $pageSidebarClosedWidth;
-            }
-        }
-    }
-}
-
-@media screen and (max-width: 800px) {
-    #page-main {
-        .page-header {
-            .page-logo {
-                display: none;
-            }
-        }
-        .page-container {
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-
-            .page-sidebar-wrapper {
-                width: 100%;
-            }
-        }
-    }
-}
-
-@media screen and (max-height: 700px) {
-    #page-main {
-        .page-footer {
-            display: none;
-        }
-    }
-}
+// @media screen and (max-width: 1000px) {
+//     #page-main {
+//         .page-header {
+//             .page-logo {
+//                 padding-left: 20px;
+//                 padding-right: 20px;
+//                 width: 20px;
+//                 > a {
+//                     display: none;
+//                 }
+//             }
+//         }
+//         .page-container {
+//             .page-sidebar-wrapper {
+//                 width: $pageSidebarClosedWidth;
+//             }
+//         }
+//     }
+// }
+
+// @media screen and (max-width: 800px) {
+//     #page-main {
+//         .page-header {
+//             .page-logo {
+//                 display: none;
+//             }
+//         }
+//         .page-container {
+//             display: flex;
+//             flex-direction: column;
+//             justify-content: flex-start;
+
+//             .page-sidebar-wrapper {
+//                 width: 100%;
+//             }
+//         }
+//     }
+// }
+
+// @media screen and (max-height: 700px) {
+//     #page-main {
+//         .page-footer {
+//             display: none;
+//         }
+//     }
+// }
 .content-scrollbar {
     height: calc(100vh - 108px);
     .el-scrollbar__bar {