From 87e3d52c62233ad44bd7bac3f43e5348a2de4e94 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 25 十一月 2024 10:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/styles/sidebar.scss | 126 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 62 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index abe5b63..2db4a1e 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,32 +1,31 @@
#app {
-
.main-container {
- height: 100%;
- transition: margin-left .28s;
- margin-left: $base-sidebar-width;
+ // height: 100%;
+ transition: padding-left 0.28s;
+ padding-left: $base-sidebar-width;
position: relative;
+ background-color: #F3F7FC;
}
.sidebarHide {
- margin-left: 0!important;
+ margin-left: 0 !important;
}
.sidebar-container {
- -webkit-transition: width .28s;
+ -webkit-transition: width 0.28s;
transition: width 0.28s;
width: $base-sidebar-width !important;
background-color: $base-menu-background;
height: 100%;
- position: fixed;
- font-size: 0px;
+ position: absolute;
+ font-size: 0;
top: 0;
bottom: 0;
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: 5px 0 10px -5px #d3d7de;
+ box-shadow: 5px 0 10px -5px #d3d7de;
// 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;
@@ -37,7 +36,7 @@
}
.el-scrollbar__bar.is-vertical {
- right: 0px;
+ right: 0;
}
.el-scrollbar {
@@ -70,39 +69,64 @@
width: 100% !important;
}
- .el-menu-item, .el-submenu__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
- .submenu-title-noDropdown,
- .el-submenu__title {
+ .theme-dark .sub-menu-title-noDropdown,
+ .theme-dark .el-sub-menu__title {
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: $base-sub-menu-title-hover !important;
+ }
+ }
+ .sub-menu-title-noDropdown,
+ .el-sub-menu__title {
+ &:hover {
+ background-color: rgba(0, 0, 0, 0.05) !important;
}
}
- & .theme-dark .is-active > .el-submenu__title {
+ & .theme-dark .is-active > .el-sub-menu__title {
color: $base-menu-color-active !important;
}
- & .nest-menu .el-submenu>.el-submenu__title,
- & .el-submenu .el-menu-item {
+ & .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(0, 0, 0, 0.1) !important;
}
}
- & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
- & .theme-dark .el-submenu .el-menu-item {
+ & .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;
&:hover {
background-color: $base-sub-menu-hover !important;
+ }
+ }
+
+ & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
+ & .theme-dark .el-menu-item {
+ &:hover {
+ // you can use $sub-menuHover
+ background-color: $base-menu-hover !important;
+ }
+ }
+ & .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.04) !important;
}
}
}
@@ -113,10 +137,10 @@
}
.main-container {
- margin-left: 54px;
+ padding-left: 54px;
}
- .submenu-title-noDropdown {
+ .sub-menu-title-noDropdown {
padding: 0 !important;
position: relative;
@@ -129,23 +153,29 @@
}
}
- .el-submenu {
+ .el-sub-menu {
overflow: hidden;
- &>.el-submenu__title {
+ & > .el-sub-menu__title {
padding: 0 !important;
.svg-icon {
margin-left: 20px;
}
-
}
}
.el-menu--collapse {
- .el-submenu {
- &>.el-submenu__title {
- &>span {
+ .el-sub-menu {
+ & > .el-sub-menu__title {
+ & > span {
+ height: 0;
+ width: 0;
+ overflow: hidden;
+ visibility: hidden;
+ display: inline-block;
+ }
+ & > i {
height: 0;
width: 0;
overflow: hidden;
@@ -157,7 +187,7 @@
}
}
- .el-menu--collapse .el-menu .el-submenu {
+ .el-menu--collapse .el-menu .el-sub-menu {
min-width: $base-sidebar-width !important;
}
@@ -168,7 +198,7 @@
}
.sidebar-container {
- transition: transform .28s;
+ transition: transform 0.28s;
width: $base-sidebar-width !important;
}
@@ -182,7 +212,6 @@
}
.withoutAnimation {
-
.main-container,
.sidebar-container {
transition: none;
@@ -192,36 +221,9 @@
// when menu collapsed
.el-menu--vertical {
- &>.el-menu {
+ & > .el-menu {
.svg-icon {
margin-right: 16px;
- }
- }
-
- .nest-menu .el-submenu>.el-submenu__title,
- .el-menu-item {
- &:hover {
- // you can use $subMenuHover
- background-color: rgba(0, 0, 0, 0.06) !important;
- }
- }
-
- // the scroll bar appears when the subMenu is too long
- >.el-menu--popup {
- max-height: 100vh;
- overflow-y: auto;
-
- &::-webkit-scrollbar-track-piece {
- background: #d3dce6;
- }
-
- &::-webkit-scrollbar {
- width: 6px;
- }
-
- &::-webkit-scrollbar-thumb {
- background: #99a9bf;
- border-radius: 20px;
}
}
}
--
Gitblit v1.8.0