oneos-v5/frontend
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

!85 fix: 冲突解决

Browse Source 
Merge pull request !85 from Jason/dev
This commit is contained in:
xingyu
2025-04-29 12:33:10 +00:00
committed by Gitee
parent 380eaed159 3d2f803dd8
commit e2a31c1c2b
10 changed files with 777 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,10 +374,10 @@ $namespace: vben;
var(--menu-item-margin-x);
font-size: var(--menu-font-size);
color: var(--menu-item-color);
white-space: nowrap;
text-decoration: none;
cursor: pointer;
white-space: nowrap;
list-style: none;
cursor: pointer;
background: var(--menu-item-background-color);
border: none;
border-radius: var(--menu-item-radius);
@@ -701,8 +701,8 @@ $namespace: vben;
width: var(--menu-item-icon-size);
height: var(--menu-item-icon-size);
margin-right: 8px;
vertical-align: middle;
text-align: center;
vertical-align: middle;
}
}