From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/assets/styles/sidebar.scss | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index df7a62f..7b035a2 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,10 +1,11 @@
#app {
.main-container {
- height: 100%;
+ min-height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
position: relative;
+ background: #F5F7FB;
}
.sidebarHide {
@@ -12,10 +13,8 @@
}
.sidebar-container {
- -webkit-transition: width .28s;
transition: width 0.28s;
width: $base-sidebar-width !important;
- background-color: $base-menu-background;
height: 100%;
position: fixed;
font-size: 0px;
@@ -25,7 +24,7 @@
z-index: 1001;
overflow: hidden;
-webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
- box-shadow: 2px 0 6px rgba(0,21,41,.35);
+ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
// reset element-ui css
.horizontal-collapse-transition {
@@ -84,12 +83,11 @@
.sub-menu-title-noDropdown,
.el-sub-menu__title {
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(212,221,255,0.56) !important;
}
}
-
- & .theme-dark .is-active > .el-sub-menu__title {
- color: $base-menu-color-active !important;
+ & .theme-light .is-active > .el-sub-menu__title {
+ color: #000000 !important;
}
& .nest-menu .el-sub-menu>.el-sub-menu__title,
@@ -97,16 +95,19 @@
min-width: $base-sidebar-width !important;
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(212,221,255,0.56) !important;
+ }
+ &.is-active {
+ background-color: rgba(212,221,255,0.56) !important;
}
}
- & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title,
- & .theme-dark .el-sub-menu .el-menu-item {
- background-color: $base-sub-menu-background !important;
+ & .theme-light .nest-menu .el-sub-menu>.el-sub-menu__title,
+ & .theme-light .el-sub-menu .el-menu-item {
+ //background-color: transparent;
&:hover {
- background-color: $base-sub-menu-hover !important;
+ background-color: rgba(212,221,255,0.56) !important;
}
}
}
@@ -132,7 +133,6 @@
}
}
}
-
.el-sub-menu {
overflow: hidden;
@@ -213,7 +213,10 @@
.el-menu-item {
&:hover {
// you can use $sub-menuHover
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(212,221,255,0.56) !important;
+ }
+ &.is-active {
+ background-color: rgba(212,221,255,0.56) !important;
}
}
--
Gitblit v1.9.3