From 2fa8b56f9c8f6605cf02cffc48000b116d27d11d Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Mon, 29 Jul 2024 16:54:00 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20(#165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: tk <fiyne1a@dingtalk.com>
---
 src/frontend/admin/src/layout/index.vue |  7 ++-----
 src/frontend/admin/src/style/app.scss   | 20 ++++++++++----------
 src/frontend/admin/src/style/dark.scss  |  1 +
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/frontend/admin/src/layout/index.vue b/src/frontend/admin/src/layout/index.vue
index 1952911b..5f9fb644 100644
--- a/src/frontend/admin/src/layout/index.vue
+++ b/src/frontend/admin/src/layout/index.vue
@@ -46,7 +46,6 @@
             </div>
             <Side-m v-if="ismobile"></Side-m>
             <div class="aminui-body el-container">
-                <Topbar v-if="!ismobile"></Topbar>
                 <Tags v-if="!ismobile && layoutTags"></Tags>
                 <div class="adminui-main" id="adminui-main">
                     <router-view v-slot="{ Component }">
@@ -94,7 +93,6 @@
             </div>
             <Side-m v-if="ismobile"></Side-m>
             <div class="aminui-body el-container">
-                <Topbar v-if="!ismobile"></Topbar>
                 <Tags v-if="!ismobile && layoutTags"></Tags>
                 <div class="adminui-main" id="adminui-main">
                     <router-view v-slot="{ Component }">
@@ -125,10 +123,9 @@
                     <el-menu
                         :default-active="active"
                         active-text-color="var(--el-color-primary)"
-                        background-color="#424C50"
                         mode="horizontal"
                         router
-                        text-color="#fff">
+                        text-color="var(--el-text-color-primary)">
                         <NavMenu :navMenus="menu"></NavMenu>
                     </el-menu>
                 </div>
@@ -336,6 +333,6 @@ export default {
 .version {
     font-size: var(--el-font-size-small);
     font-weight: var(--el-font-weight-primary);
-    color: var(--el-text-color-disabled);
+    color: var(--el-text-color-secondary);
 }
 </style>
\ No newline at end of file
diff --git a/src/frontend/admin/src/style/app.scss b/src/frontend/admin/src/style/app.scss
index 3d926510..fd36a068 100644
--- a/src/frontend/admin/src/style/app.scss
+++ b/src/frontend/admin/src/style/app.scss
@@ -108,10 +108,10 @@ textarea {
 /* 头部 */
 .adminui-header {
     height: 4rem;
-    background: #424c50;
-    color: #fff;
+    background: #fff;
     display: flex;
     justify-content: space-between;
+    border-bottom: #ebeef5 1px solid;
 }
 
 .adminui-header-left {
@@ -148,7 +148,7 @@ textarea {
     padding: 0 1rem;
     margin: 0 1rem 0 0;
     font-size: 1.1rem;
-    color: rgba(255, 255, 255, 0.6);
+    color: var(--el-menu-text-color);
     list-style: none;
     height: 100%;
     display: flex;
@@ -161,29 +161,29 @@ textarea {
 }
 
 .adminui-header .nav li:hover {
-    color: #fff;
 }
 
 .adminui-header .nav li.active {
-    background: rgba(255, 255, 255, 0.1);
-    color: #fff;
+    color: var(--el-color-primary);
 }
 
 .adminui-header .user-bar .panel-item:hover {
     background: rgba(255, 255, 255, 0.1) !important;
 }
 
-.adminui-header .user-bar .user label {
-    color: #fff;
+.user-bar * {
+    color: var(--el-menu-text-color);
 }
 
 /* 左侧菜单 */
 .aminui-side-split {
     width: 5rem;
     flex-shrink: 0;
-    background: #424c50;
+    background: #fff;
+    color: var(--el-menu-text-color);
     display: flex;
     flex-flow: column;
+    border-right: #ebeef5 1px solid;
 }
 
 .aminui-side-split-top {
@@ -214,7 +214,6 @@ textarea {
     cursor: pointer;
     width: 5rem;
     height: 5rem;
-    color: #fff;
     text-align: center;
     display: flex;
     flex-direction: column;
@@ -236,6 +235,7 @@ textarea {
 
 .aminui-side-split li.active {
     background: #21a675;
+    color: #fff;
 }
 
 .adminui-side-split-scroll::-webkit-scrollbar-thumb {
diff --git a/src/frontend/admin/src/style/dark.scss b/src/frontend/admin/src/style/dark.scss
index 16256d2d..8709cf55 100644
--- a/src/frontend/admin/src/style/dark.scss
+++ b/src/frontend/admin/src/style/dark.scss
@@ -29,6 +29,7 @@ html.dark {
 
     .aminui-side-split {
         background: var(--el-bg-color);
+        border-color: var(--el-bg-color);
     }
 
     .aminui-side-split li {