From 36fc9186e39f2fd317603728b4ad3482a91b079b Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期三, 19 三月 2025 14:22:48 +0800 Subject: [PATCH] 合并装备代码 --- src/assets/styles/sidebar.scss | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index e6f52a7..69f9693 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,17 +1,18 @@ #app { + .main-container { height: 100%; - transition: margin-left 0.28s; + transition: margin-left .28s; margin-left: $base-sidebar-width; position: relative; } .sidebarHide { - margin-left: 0 !important; + margin-left: 0!important; } .sidebar-container { - -webkit-transition: width 0.28s; + -webkit-transition: width .28s; transition: width 0.28s; width: $base-sidebar-width !important; background-color: $base-menu-background; @@ -23,13 +24,12 @@ left: 0; z-index: 1001; overflow: hidden; - -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35); + -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); //box-shadow: 2px 0 6px rgba(0,21,41,.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 { @@ -70,8 +70,7 @@ width: 100% !important; } - .el-menu-item, - .el-submenu__title { + .el-menu-item, .el-submenu__title { overflow: hidden !important; text-overflow: ellipsis !important; white-space: nowrap !important; @@ -81,7 +80,7 @@ .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; } } @@ -89,16 +88,16 @@ color: $base-menu-color-active !important; } - & .nest-menu .el-submenu > .el-submenu__title, + & .nest-menu .el-submenu>.el-submenu__title, & .el-submenu .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.08) !important; } } - & .theme-dark .nest-menu .el-submenu > .el-submenu__title, + & .theme-dark .nest-menu .el-submenu>.el-submenu__title, & .theme-dark .el-submenu .el-menu-item { background-color: $base-sub-menu-background !important; @@ -138,7 +137,7 @@ .el-submenu { overflow: hidden; - & > .el-submenu__title { + &>.el-submenu__title { padding: 0 !important; .svg-icon { @@ -146,17 +145,18 @@ height: 1.5em; margin-left: 25px; } + } } .el-menu--collapse { .el-submenu { - & > .el-submenu__title { + &>.el-submenu__title { height: auto; /* 鏍规嵁鍐呭鑷姩璋冩暣楂樺害 */ flex-direction: column; /* 鏀瑰彉甯冨眬鏂瑰悜涓哄瀭鐩� */ align-items: center; /* 灞呬腑瀵归綈 */ margin-bottom: 10px; - & > span { + &>span { display: block !important; visibility: visible !important; white-space: normal; /* 鍏佽鎹㈣ */ @@ -179,7 +179,7 @@ } .sidebar-container { - transition: transform 0.28s; + transition: transform .28s; width: $base-sidebar-width !important; } @@ -193,6 +193,7 @@ } .withoutAnimation { + .main-container, .sidebar-container { transition: none; @@ -202,13 +203,13 @@ // when menu collapsed .el-menu--vertical { - & > .el-menu { + &>.el-menu { .svg-icon { margin-right: 16px; } } - .nest-menu .el-submenu > .el-submenu__title, + .nest-menu .el-submenu>.el-submenu__title, .el-menu-item { &:hover { // you can use $subMenuHover @@ -217,7 +218,7 @@ } // the scroll bar appears when the subMenu is too long - > .el-menu--popup { + >.el-menu--popup { max-height: 100vh; overflow-y: auto; -- Gitblit v1.9.3