From e03b2546f020327bf9fd414d8869a9ccd2270c2d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 17 六月 2025 17:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev
---
src/assets/styles/sidebar.scss | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index bced48f..8534448 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,17 +1,19 @@
#app {
-
.main-container {
min-height: 100%;
- transition: margin-left .28s;
+ transition: margin-left 0.28s;
margin-left: $base-sidebar-width;
position: relative;
+ background: #f5f7fb;
+ }
+
+ .sidebarHide {
+ margin-left: 0 !important;
}
.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;
@@ -20,12 +22,13 @@
left: 0;
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);
+ -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
// reset element-ui css
.horizontal-collapse-transition {
- transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+ transition: 0s width ease-in-out, 0s padding-left ease-in-out,
+ 0s padding-right ease-in-out;
}
.scrollbar-wrapper {
@@ -66,39 +69,46 @@
width: 100% !important;
}
- .el-menu-item, .el-sub-menu__title {
+ .el-menu-item,
+ .menu-title {
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
+ }
+
+ .el-menu-item .el-menu-tooltip__trigger {
+ display: inline-block !important;
}
// menu hover
.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.8) !important;
}
}
-
- & .theme-dark .is-active > .el-sub-menu__title {
- color: $base-menu-color-active !important;
+ & .theme-light .is-active > .el-sub-menu__title {
+ color: #fff !important;
}
- & .nest-menu .el-sub-menu>.el-sub-menu__title,
+ & .nest-menu .el-sub-menu > .el-sub-menu__title,
& .el-sub-menu .el-menu-item {
min-width: $base-sidebar-width !important;
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(212, 221, 255, 0.8) !important;
+ }
+ &.is-active {
+ background-color: #fff !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.8) !important;
}
}
}
@@ -124,31 +134,29 @@
}
}
}
-
.el-sub-menu {
overflow: hidden;
- &>.el-sub-menu__title {
+ & > .el-sub-menu__title {
padding: 0 !important;
.svg-icon {
margin-left: 20px;
}
-
}
}
.el-menu--collapse {
.el-sub-menu {
- &>.el-sub-menu__title {
- &>span {
+ & > .el-sub-menu__title {
+ & > span {
height: 0;
width: 0;
overflow: hidden;
visibility: hidden;
display: inline-block;
}
- &>i {
+ & > i {
height: 0;
width: 0;
overflow: hidden;
@@ -171,7 +179,7 @@
}
.sidebar-container {
- transition: transform .28s;
+ transition: transform 0.28s;
width: $base-sidebar-width !important;
}
@@ -185,7 +193,6 @@
}
.withoutAnimation {
-
.main-container,
.sidebar-container {
transition: none;
@@ -195,22 +202,25 @@
// when menu collapsed
.el-menu--vertical {
- &>.el-menu {
+ & > .el-menu {
.svg-icon {
margin-right: 16px;
}
}
- .nest-menu .el-sub-menu>.el-sub-menu__title,
+ .nest-menu .el-sub-menu > .el-sub-menu__title,
.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;
}
}
// the scroll bar appears when the sub-menu is too long
- >.el-menu--popup {
+ > .el-menu--popup {
max-height: 100vh;
overflow-y: auto;
--
Gitblit v1.9.3