From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/assets/styles/sidebar.scss | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 0f43008..69f9693 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -71,34 +71,16 @@
}
.el-menu-item, .el-submenu__title {
- display: flex;
- align-items: center;
- }
- .el-submenu__title span {
- white-space: normal;
- word-break: break-all;
- line-height: 20px;
- flex: 1;
- padding-right: 20px;
- }
-
- .el-menu-item {
- display: flex;
- align-items: center;
- padding-right: 20px !important;
- }
- .el-menu-item span {
- white-space: normal;
- word-break: break-all;
- line-height: 20px;
- flex: 1;
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ white-space: nowrap !important;
}
// menu hover
.submenu-title-noDropdown,
.el-submenu__title {
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(0, 0, 0, 0.08) !important;
}
}
@@ -111,7 +93,7 @@
min-width: $base-sidebar-width !important;
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(0, 0, 0, 0.08) !important;
}
}
@@ -127,11 +109,11 @@
.hideSidebar {
.sidebar-container {
- width: 54px !important;
+ width: 70px !important;
}
.main-container {
- margin-left: 54px;
+ margin-left: 70px;
}
.submenu-title-noDropdown {
@@ -142,11 +124,16 @@
padding: 0 !important;
.svg-icon {
- margin-left: 20px;
+ width: 1.5em;
+ height: 1.5em;
+ margin-left: 25px;
}
}
}
-
+ .el-menu-item.is-active,
+ .el-submenu.is-active > .el-submenu__title {
+ background-color: transparent !important;
+ }
.el-submenu {
overflow: hidden;
@@ -154,7 +141,9 @@
padding: 0 !important;
.svg-icon {
- margin-left: 20px;
+ width: 1.5em;
+ height: 1.5em;
+ margin-left: 25px;
}
}
@@ -163,12 +152,16 @@
.el-menu--collapse {
.el-submenu {
&>.el-submenu__title {
+ height: auto; /* 鏍规嵁鍐呭鑷姩璋冩暣楂樺害 */
+ flex-direction: column; /* 鏀瑰彉甯冨眬鏂瑰悜涓哄瀭鐩� */
+ align-items: center; /* 灞呬腑瀵归綈 */
+ margin-bottom: 10px;
&>span {
- height: 0;
- width: 0;
- overflow: hidden;
- visibility: hidden;
- display: inline-block;
+ display: block !important;
+ visibility: visible !important;
+ white-space: normal; /* 鍏佽鎹㈣ */
+ text-align: center; /* 鏂囨湰灞呬腑瀵归綈 */
+ line-height: normal;
}
}
}
--
Gitblit v1.9.3