feat: 与上游合并

This commit is contained in:
bunny 2025-04-29 18:15:27 +08:00
parent 67d30ed976
commit c9d9bcd76d
2 changed files with 10 additions and 10 deletions

View File

@ -83,8 +83,8 @@
.el-upload-list__item.is-ready &.el-icon--close { .el-upload-list__item.is-ready &.el-icon--close {
width: 24px; width: 24px;
height: 24px; height: 24px;
border-radius: 4px;
outline: none; outline: none;
border-radius: 4px;
transition: transition:
background-color 0.2s, background-color 0.2s,
color 0.2s; color 0.2s;
@ -117,8 +117,8 @@
} }
& .el-message__closeBtn { & .el-message__closeBtn {
border-radius: 4px;
outline: none; outline: none;
border-radius: 4px;
transition: transition:
background-color 0.2s, background-color 0.2s,
color 0.2s; color 0.2s;

View File

@ -193,8 +193,8 @@
.el-menu-item.is-active.nest-menu::before { .el-menu-item.is-active.nest-menu::before {
position: absolute; position: absolute;
inset: 0 8px; inset: 0 8px;
margin: 4px 0;
clear: both; clear: both;
margin: 4px 0;
content: ''; content: '';
background: var(--el-color-primary) !important; background: var(--el-color-primary) !important;
border-radius: 3px; border-radius: 3px;
@ -212,13 +212,13 @@
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
clear: both;
width: 2px; width: 2px;
height: 100%; height: 100%;
clear: both;
content: ''; content: '';
background-color: $menuActiveBefore; background-color: $menuActiveBefore;
transition: all var(--pure-transition-duration) ease-in-out;
transform: translateY(0); transform: translateY(0);
transition: all var(--pure-transition-duration) ease-in-out;
} }
.el-menu--collapse .outer-most.el-sub-menu > .el-sub-menu__title::before { .el-menu--collapse .outer-most.el-sub-menu > .el-sub-menu__title::before {
@ -240,8 +240,8 @@
.is-active.submenu-title-noDropdown.outer-most::before { .is-active.submenu-title-noDropdown.outer-most::before {
position: absolute; position: absolute;
inset: 0 8px; inset: 0 8px;
margin: 4px 0;
clear: both; clear: both;
margin: 4px 0;
content: ''; content: '';
background: var(--el-color-primary) !important; background: var(--el-color-primary) !important;
border-radius: 3px; border-radius: 3px;
@ -435,11 +435,11 @@
height: 32px; height: 32px;
margin: 2px 0 0 12px; margin: 2px 0 0 12px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
line-height: 32px; line-height: 32px;
color: $subMenuActiveText; color: $subMenuActiveText;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
} }
@ -577,8 +577,8 @@
&.hideSidebar { &.hideSidebar {
.sidebar-container { .sidebar-container {
pointer-events: none; pointer-events: none;
transition-duration: 0.3s;
transform: translate3d(-$sideBarWidth, 0, 0); transform: translate3d(-$sideBarWidth, 0, 0);
transition-duration: 0.3s;
} }
} }
} }
@ -621,10 +621,10 @@ body[layout='vertical'] {
.el-sub-menu { .el-sub-menu {
& > .el-sub-menu__title { & > .el-sub-menu__title {
& > span { & > span {
visibility: visible;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center; text-align: center;
visibility: visible;
} }
} }
} }
@ -715,10 +715,10 @@ body[layout='mix'] {
padding: 0; padding: 0;
& > span { & > span {
visibility: visible;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center; text-align: center;
visibility: visible;
} }
} }
} }