new

2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -45,7 +45,11 @@
    .el-menu {
      border: none;
      height: 100%;
+<<<<<<< HEAD
      background: #152c7c!important;
+=======
+      background: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      width: 100% !important;
    }
  }