panhui 4 år sedan
förälder
incheckning
51d3e52b3c

BIN
src/main/vue/src/assets/logo.png


+ 1 - 1
src/main/vue/src/components/CropUpload.vue

@@ -100,7 +100,7 @@ export default {
     }
 
     &:hover {
-        border-color: #409eff;
+        border-color: #d7ab41;
     }
 }
 

+ 1 - 1
src/main/vue/src/components/FileUpload.vue

@@ -235,7 +235,7 @@ export default {
             margin-left: 15px;
             transition: color 0.3s;
             &:hover {
-                color: #409eff;
+                color: #d7ab41;
             }
         }
     }

+ 1 - 1
src/main/vue/src/components/JsonView.vue

@@ -104,6 +104,6 @@ export default {
 }
 
 .json-view .json-view-content .json-view-content-key {
-    color: #409eff;
+    color: #d7ab41;
 }
 </style>

+ 2 - 2
src/main/vue/src/components/SingleUpload.vue

@@ -97,7 +97,7 @@ export default {
     background-color: #fbfdff;
 
     &:hover {
-        border-color: #409eff;
+        border-color: #d7ab41;
     }
 }
 
@@ -111,7 +111,7 @@ export default {
     overflow: hidden;
 
     &:hover {
-        border-color: #409eff;
+        border-color: #d7ab41;
     }
 }
 

+ 1 - 1
src/main/vue/src/main.js

@@ -15,7 +15,7 @@ import CropUpload from '@/components/CropUpload';
 import DistrictChoose from '@/components/DistrictChoose';
 import Formatters from '@/mixins/formatters';
 import 'normalize.css/normalize.css';
-import 'element-ui/lib/theme-chalk/index.css';
+import './styles/element_theme/index.css';
 
 // import VueAMap from "vue-amap";
 // Vue.use(VueAMap);

+ 2 - 2
src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://localhost:8080';
-        baseUrl = 'http://192.168.50.127:8080';
+        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

+ 4 - 4
src/main/vue/src/styles/app.less

@@ -58,7 +58,7 @@ li {
 
 .el-menu-item.is-active {
     background: #1f2d3d !important;
-    border-left: 2px solid rgb(32, 160, 255);
+    border-left: 2px solid #D7AB41;
 }
 
 .el-menu {
@@ -127,7 +127,7 @@ li {
 
 .table-column-filter {
     cursor: pointer;
-    color: #409eff;
+    color: #D7AB41;
     float: right;
     height: 36px;
     margin-bottom: 10px;
@@ -185,14 +185,14 @@ li {
             border-bottom-color: #c0c4cc;
             top: 6px;
             &.active {
-                border-bottom-color: #409eff;
+                border-bottom-color: #D7AB41;
             }
         }
         &.desc {
             border-top-color: #c0c4cc;
             bottom: 6px;
             &.active {
-                border-top-color: #409eff;
+                border-top-color: #D7AB41;
             }
         }
     }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
src/main/vue/src/styles/element_theme/index.css


+ 40 - 8
src/main/vue/src/views/Admin.vue

@@ -1,10 +1,14 @@
 <template>
     <el-container id="app">
-        <el-aside :width="collapse ? '65px' : '200px'" class="aside">
-            <div class="logo-wrapper">Thoma&nbsp;<b>Admin</b></div>
+        <el-aside :class="{ isCollapse: collapse }" :width="collapse ? '65px' : '200px'" class="aside">
+            <div class="logo-wrapper">
+                <div class="logo">
+                    <img src="../assets/logo.png" alt="" />
+                </div>
+            </div>
             <el-menu
                 :collapse="collapse"
-                background-color="#324157"
+                background-color="#333230"
                 text-color="#BFCBD9"
                 active-text-color="#20A0FF"
                 :unique-opened="true"
@@ -316,10 +320,13 @@ export default {
 #app {
     height: 100%;
 }
-
+.el-header {
+    padding: 0;
+}
 .header-top {
-    color: #303133;
-    background: #fff;
+    padding: 0 20px;
+    color: #fff;
+    background: #42413e;
     display: flex;
     align-items: center;
     padding-left: 0;
@@ -352,9 +359,10 @@ export default {
 }
 
 .aside {
-    background: #324157;
+    background: #333230;
     transition: all 0.4s ease;
     -ms-overflow-style: none;
+
     .logo-wrapper {
         font-weight: 200;
         display: flex;
@@ -363,7 +371,31 @@ export default {
         height: 60px;
         color: white;
         font-size: 20px;
-        background: fade(black, 20%);
+        background: #42413e;
+        box-sizing: border-box;
+
+        .logo {
+            height: 40px;
+            width: 140px;
+            position: relative;
+            overflow: hidden;
+            transition: width ease-in-out 0.3s;
+            img {
+                width: 140px;
+                height: 40px;
+                position: absolute;
+                top: 0;
+                left: 0;
+            }
+        }
+    }
+
+    &.isCollapse {
+        .logo-wrapper {
+            .logo {
+                width: 40px;
+            }
+        }
     }
 }
 

+ 1 - 1
src/main/vue/src/views/MenuAuthority.vue

@@ -36,7 +36,7 @@
             <div class="title">预览</div>
             <el-menu
                 :collapse="false"
-                background-color="#324157"
+                background-color="#333230"
                 text-color="#BFCBD9"
                 active-text-color="#20A0FF"
                 :unique-opened="true"

+ 3 - 3
src/main/vue/src/views/Menus.vue

@@ -449,7 +449,7 @@ export default {
         opacity: 0;
     }
     &.selected {
-        border: 2px solid #409eff;
+        border: 2px solid #d7ab41;
         border-radius: 4px;
         padding: 0 10px;
         box-sizing: border-box;
@@ -466,10 +466,10 @@ export default {
 }
 
 .available-icons {
-    color: #409eff;
+    color: #d7ab41;
     text-decoration: none;
     &:hover {
-        color: #409eff;
+        color: #d7ab41;
         text-decoration: none;
     }
 }

Vissa filer visades inte eftersom för många filer har ändrats