guhongwei 3 anni fa
parent
commit
067d276836

+ 34 - 18
src/assets/css/color-dark.css

@@ -1,28 +1,44 @@
-.header{
-    background-color: #242f42;
+.header {
+  background-color: #242f42 !important;
 }
-.login-wrap{
-    background: #324157;
+.login-wrap {
+  background: #324157;
 }
-.plugins-tips{
-    background: #eef1f6;
+.plugins-tips {
+  background: #eef1f6;
 }
-.plugins-tips a{
-    color: #20a0ff;
+.plugins-tips a {
+  color: #20a0ff;
 }
 .el-upload--text em {
-    color: #20a0ff;
+  color: #20a0ff;
 }
-.pure-button{
-    background: #20a0ff;
+.pure-button {
+  background: #20a0ff;
 }
 .tags-li.active {
-    border: 1px solid #409EFF;
-    background-color: #409EFF;
+  border: 1px solid #409eff;
+  background-color: #409eff;
 }
-.message-title{
-    color: #20a0ff;
+.message-title {
+  color: #20a0ff;
+}
+.collapse-btn:hover {
+  background: rgb(40, 52, 70);
+}
+
+.sidebar {
+  background-color: #242f42 !important;
+}
+.sidebar-el-menu:not(.el-menu--collapse) {
+  background-color: #242f42 !important;
+}
+.el-menu-item:hover {
+  background-color: #142832 !important;
+}
+.el-menu-item {
+  color: #ffffff;
+}
+.el-menu-item.is-active {
+  background-color: #142832 !important;
 }
-.collapse-btn:hover{
-    background: rgb(40,52,70);
-}

+ 1 - 1
src/assets/css/main.css

@@ -34,7 +34,7 @@ a {
 }
 
 .content {
-    width: auto;
+    width: 100%;
     height: 100%;
     padding: 10px;
     overflow-y: scroll;

+ 41 - 19
src/assets/css/theme-green/color-green.css

@@ -1,29 +1,51 @@
-.header{
-    background-color: #07c4a8;
+.header {
+  background-color: #07c4a8 !important;
 }
-.login-wrap{
-    background: rgba(56, 157, 170, 0.82);;
+.login-wrap {
+  background: rgba(56, 157, 170, 0.82);
 }
-.plugins-tips{
-    background: #f2f2f2;
+.plugins-tips {
+  background: #f2f2f2;
 }
-.plugins-tips a{
-    color: #00d1b2;
+.plugins-tips a {
+  color: #00d1b2;
 }
 .el-upload--text em {
-    color: #00d1b2;
+  color: #00d1b2;
 }
-.pure-button{
-    background: #00d1b2;
+.pure-button {
+  background: #00d1b2;
 }
-.pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus {
-    background-color: #00d1b2 !important;
-    border-color: #00d1b2 !important;
+.pagination > .active > a,
+.pagination > .active > a:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span,
+.pagination > .active > span:hover,
+.pagination > .active > span:focus {
+  background-color: #00d1b2 !important;
+  border-color: #00d1b2 !important;
 }
 .tags-li.active {
-    border: 1px solid #00d1b2;
-    background-color: #00d1b2;
+  border: 1px solid #00d1b2 !important;
+  background-color: #00d1b2 !important;
+}
+.collapse-btn:hover {
+  background: #00d1b2;
+}
+
+.sidebar {
+  background-color: #00d1b2 !important;
+}
+.el-menu {
+  background-color: #00d1b2 !important;
+}
+.el-menu-item.is-active {
+  color: #ffffff;
+  background-color: #00a78e !important;
+}
+.el-menu-item:hover{
+   background-color: #00a78e !important;
+}
+.sidebar-el-menu:not(.el-menu--collapse) {
+  background-color: #00d1b2 !important;
 }
-.collapse-btn:hover{
-    background: #00d1b2;
-}

+ 6 - 5
src/components/admin-frame/Sidebar.vue

@@ -7,9 +7,9 @@
             class="sidebar-el-menu"
             :default-active="onRoutes"
             :collapse="collapse"
-            background-color="#324157"
-            text-color="#bfcbd9"
-            active-text-color="#20a0ff"
+            :background-color="menuInfo.backColor"
+            :text-color="menuInfo.textColor"
+            :active-text-color="menuInfo.activeColor"
             unique-opened
             router
           >
@@ -45,6 +45,7 @@
 
 <script>
 const { system, userMenu } = require('../../layout/deploy/menu');
+const { menuInfo } = require('../../layout/deploy/site');
 import { mapState, createNamespacedHelpers } from 'vuex';
 import _ from 'lodash';
 import bus from './bus';
@@ -54,6 +55,7 @@ export default {
   components: {},
   data: function() {
     return {
+      menuInfo: menuInfo,
       collapse: false,
       items: system,
     };
@@ -74,7 +76,7 @@ export default {
   computed: {
     ...mapState(['user']),
     onRoutes() {
-      return this.$route.path.replace('/', '');
+      return this.$route.path;
     },
   },
   metaInfo() {
@@ -100,7 +102,6 @@ export default {
   top: 60px;
   bottom: 0;
   overflow-y: scroll;
-  background-color: rgb(50, 65, 87);
 }
 .sidebar::-webkit-scrollbar {
   width: 0;

+ 4 - 4
src/components/admin-frame/Tags.vue

@@ -168,10 +168,10 @@ export default {
       }
       .tags-li-title {
         float: left;
-        max-width: 80px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
+        // max-width: 80px;
+        // overflow: hidden;
+        // white-space: nowrap;
+        // text-overflow: ellipsis;
         margin-right: 5px;
         color: #666;
       }

+ 0 - 5
src/components/frame/form.vue

@@ -213,11 +213,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.form {
-  padding: 0 1rem;
-  background: #fff;
-  border-radius: 20px;
-}
 // /deep/.btn .el-form-item__content {
 //   margin-left: 0 !important;
 // }

+ 2 - 2
src/layout/deploy/site.js

@@ -10,10 +10,10 @@ export const menuInfo = {
   info: {
     display: true,
     mode: 'horizontal',
-    backColor: '#0457c7',
+    backColor: '#00d1b2',
     textColor: '#ffffff',
     // actColor: '#fe950e',
-    actColor: '#ffffff',
+    // actColor: '#ffffff',
   },
   menuList: [
     { icon: '', index: '/test1/index', title: '测试菜单一' },