yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: some icons behave inconsistently on menu and tab (#4144)

pull/48/MERGE
Li Kui 2024-08-13 22:07:02 +08:00 committed by GitHub
parent 4793c4c0db
commit 963e79063f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/@core/ui-kit/menu-ui/src/components/menu.vue
View File

@ -542,15 +542,6 @@ $namespace: vben;
} }
& > .#{$namespace}-sub-menu { & > .#{$namespace}-sub-menu {
// .#{$namespace}-menu {
// background: var(--menu-submenu-opened-background-color);
// .#{$namespace}-sub-menu,
// .#{$namespace}-menu-item:not(.is-active),
// .#{$namespace}-sub-menu-content:not(.is-active) {
// background: var(--menu-submenu-opened-background-color);
// }
// }
& > .#{$namespace}-menu { & > .#{$namespace}-menu {
& > .#{$namespace}-menu-item { & > .#{$namespace}-menu-item {
padding-left: calc( padding-left: calc(
@ -713,13 +704,11 @@ $namespace: vben;
.#{$namespace}-menu-item { .#{$namespace}-menu-item {
fill: var(--menu-item-color); fill: var(--menu-item-color);
stroke: var(--menu-item-color);
@include menu-item; @include menu-item;
&.is-active { &.is-active {
fill: var(--menu-item-active-color); fill: var(--menu-item-active-color);
stroke: var(--menu-item-active-color);
@include menu-item-active; @include menu-item-active;
} }
@ -783,7 +772,6 @@ $namespace: vben;
list-style: none; list-style: none;
background: var(--menu-submenu-background-color); background: var(--menu-submenu-background-color);
fill: var(--menu-item-color); fill: var(--menu-item-color);
stroke: var(--menu-item-color);
&.is-active { &.is-active {
div[data-state='open'] > .#{$namespace}-sub-menu-content, div[data-state='open'] > .#{$namespace}-sub-menu-content,
@ -794,7 +782,6 @@ $namespace: vben;
cursor: pointer; cursor: pointer;
background: var(--menu-submenu-active-background-color); background: var(--menu-submenu-active-background-color);
fill: var(--menu-submenu-active-color); fill: var(--menu-submenu-active-color);
stroke: var(--menu-submenu-active-color);
} }
} }
} }

6
packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
View File

@ -108,9 +108,6 @@ function scrollIntoView() {
<div <div
class="absolute right-1.5 top-1/2 z-[3] translate-y-[-50%] overflow-hidden" class="absolute right-1.5 top-1/2 z-[3] translate-y-[-50%] overflow-hidden"
> >
<!-- <div
class="absolute right-1.5 top-1/2 z-[3] translate-y-[-50%] overflow-hidden opacity-0 transition-opacity group-hover:opacity-100 group-[.is-active]:opacity-100"
> -->
<!-- close-icon --> <!-- close-icon -->
<X <X
v-show=" v-show="
@ -130,9 +127,6 @@ function scrollIntoView() {
<div <div
class="text-accent-foreground group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground mx-3 mr-4 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pr-3 transition-all duration-300" class="text-accent-foreground group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground mx-3 mr-4 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pr-3 transition-all duration-300"
> >
<!-- <div
class="mx-3 ml-3 mr-2 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] transition-all duration-300 group-hover:mr-2 group-hover:pr-4 group-[.is-active]:pr-4"
> -->
<VbenIcon <VbenIcon
v-if="showIcon" v-if="showIcon"
:icon="tab.icon" :icon="tab.icon"