From d9bcfaf7742baa8ec0f21f4d56993d8ead1a33ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Tue, 23 Jan 2024 14:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/admin/components/navBar/tabs.vue | 34 +++++++++++---------
 src/layouts/admin/components/navMenus.vue    |  5 ++-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/layouts/admin/components/navBar/tabs.vue b/src/layouts/admin/components/navBar/tabs.vue
index a61b88e..69657f5 100644
--- a/src/layouts/admin/components/navBar/tabs.vue
+++ b/src/layouts/admin/components/navBar/tabs.vue
@@ -208,26 +208,28 @@ onMounted(() => {
     overflow-y: hidden;
     margin-right: var(--ba-main-space);
     scrollbar-width: none;
+
     &::-webkit-scrollbar {
         height: 5px;
     }
 
-    &::-webkit-scrollbar-thumb {
-        background: #eaeaea;
-        border-radius: var(--el-border-radius-base);
-        box-shadow: none;
-        -webkit-box-shadow: none;
-    }
-
-    &::-webkit-scrollbar-track {
-        background: v-bind('config.layout.layoutMode == "Default" ? "none":config.getColorVal("headerBarBackground")');
-    }
-
-    &:hover {
-        &::-webkit-scrollbar-thumb:hover {
-            background: #c8c9cc;
-        }
-    }
+    //
+    //&::-webkit-scrollbar-thumb {
+    //    background: #eaeaea;
+    //    border-radius: var(--el-border-radius-base);
+    //    box-shadow: none;
+    //    -webkit-box-shadow: none;
+    //}
+    //
+    //&::-webkit-scrollbar-track {
+    //    background: v-bind('config.layout.layoutMode == "Default" ? "none":config.getColorVal("headerBarBackground")');
+    //}
+    //
+    //&:hover {
+    //    &::-webkit-scrollbar-thumb:hover {
+    //        background: #c8c9cc;
+    //    }
+    //}
 }
 
 .ba-nav-tab {
diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue
index e05f73f..8efc6db 100644
--- a/src/layouts/admin/components/navMenus.vue
+++ b/src/layouts/admin/components/navMenus.vue
@@ -13,7 +13,7 @@
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
                 v-if="state.isFullScreen"
-                name="fa-solid fa-minimize"
+                name="fa-solid fa-compress"
                 size="18"
             />
             <Icon
@@ -177,6 +177,9 @@ const onLogout = () => {
         cursor: pointer;
         user-select: none;
         color: v-bind('configStore.getColorVal("headerBarTabColor")');
+        &:hover {
+            color: v-bind('configStore.getColorVal("headerBarTabActiveColor")');
+        }
     }
     .admin-name {
         padding-left: 6px;