From 904ee32b2468482af778d424eba7cfe51b511bcd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 05 二月 2025 09:19:53 +0800
Subject: [PATCH] !180 fix 修复 消息弹框内容过长不换行 Merge pull request !180 from zst_2001/dev
---
src/assets/styles/sidebar.scss | 96 ++++++++++++++++++++++-------------------------
1 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 0808812..d85da55 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,35 +1,37 @@
#app {
-
.main-container {
- min-height: 100%;
- transition: margin-left .28s;
+ height: 100%;
+ transition: margin-left 0.28s;
margin-left: $base-sidebar-width;
position: relative;
}
.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;
+ 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: 2px 0 6px rgba(0, 21, 41, 0.35);
+ box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
// 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 {
@@ -37,7 +39,7 @@
}
.el-scrollbar__bar.is-vertical {
- right: 0px;
+ right: 0;
}
.el-scrollbar {
@@ -70,7 +72,8 @@
width: 100% !important;
}
- .el-menu-item, .menu-title {
+ .el-menu-item,
+ .menu-title {
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
@@ -81,10 +84,16 @@
}
// menu hover
+ .theme-dark .sub-menu-title-noDropdown,
+ .theme-dark .el-sub-menu__title {
+ &:hover {
+ background-color: $base-sub-menu-title-hover !important;
+ }
+ }
.sub-menu-title-noDropdown,
.el-sub-menu__title {
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(0, 0, 0, 0.05) !important;
}
}
@@ -92,21 +101,35 @@
color: $base-menu-color-active !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(0, 0, 0, 0.1) !important;
}
}
- & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title,
+ & .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;
}
}
}
@@ -136,27 +159,26 @@
.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;
@@ -179,7 +201,7 @@
}
.sidebar-container {
- transition: transform .28s;
+ transition: transform 0.28s;
width: $base-sidebar-width !important;
}
@@ -193,7 +215,6 @@
}
.withoutAnimation {
-
.main-container,
.sidebar-container {
transition: none;
@@ -203,36 +224,9 @@
// when menu collapsed
.el-menu--vertical {
- &>.el-menu {
+ & > .el-menu {
.svg-icon {
margin-right: 16px;
- }
- }
-
- .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;
- }
- }
-
- // the scroll bar appears when the sub-menu 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.9.3