Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
1bc237d7
Commit
1bc237d7
authored
Dec 03, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(menu): fix menu icon style
parent
c303ec1a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
3 deletions
+20
-3
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+2
-1
index.less
src/components/Menu/src/index.less
+12
-0
LayoutMultipleHeader.less
src/layouts/default/header/LayoutMultipleHeader.less
+4
-1
LayoutMultipleHeader.tsx
src/layouts/default/header/LayoutMultipleHeader.tsx
+2
-1
No files found.
CHANGELOG.zh_CN.md
View file @
1bc237d7
...
...
@@ -17,7 +17,8 @@
### 🐛 Bug Fixes
-修复表格 i18n 错误
-
修复表格 i18n 错误
-
修复菜单图标大小不一致
## 2.0.0-rc.12 (2020-11-30)
...
...
src/components/Menu/src/index.less
View file @
1bc237d7
...
...
@@ -212,6 +212,10 @@
background: @sider-dark-bg-color;
.active-menu-style();
.menu-item-icon.app-iconify {
display: inline-block !important;
}
.ant-menu-item.ant-menu-item-selected.basic-menu-menu-item__level1,
.ant-menu-submenu-selected.basic-menu-menu-item__level1 {
color: @white;
...
...
@@ -232,6 +236,10 @@
.basic-menu-item__level3:not(.ant-menu-item-selected) {
background-color: @sider-dark-lighten-2-bg-color;
.ant-menu-item {
background-color: @sider-dark-lighten-2-bg-color;
}
}
.ant-menu-submenu-title {
...
...
@@ -253,6 +261,10 @@
overflow-x: hidden;
border-right: none;
.menu-item-icon.app-iconify {
display: inline-block !important;
}
// .ant-menu-item-selected {
// background: fade(@primary-color, 18%);
// }
...
...
src/layouts/default/header/LayoutMultipleHeader.less
View file @
1bc237d7
.multiple-tab-header {
flex: 0 0 auto;
margin-left: -1px;
&.dark {
margin-left: -1px;
}
&.fixed {
position: fixed;
...
...
src/layouts/default/header/LayoutMultipleHeader.tsx
View file @
1bc237d7
...
...
@@ -29,6 +29,7 @@ export default defineComponent({
getShowFullHeaderRef
,
getShowHeader
,
getUnFixedAndFull
,
getHeaderTheme
,
}
=
useHeaderSetting
();
const
{
getFullContent
}
=
useFullContent
();
...
...
@@ -110,7 +111,7 @@ export default defineComponent({
{
unref
(
getIsShowPlaceholderDom
)
&&
<
div
style=
{
unref
(
getPlaceholderDomStyle
)
}
/>
}
<
div
style=
{
unref
(
getWrapStyle
)
}
class=
{
[
'
multiple-tab-header
'
,
{
fixed
:
unref
(
getIsFixed
)
}]
}
class=
{
[
'
multiple-tab-header
'
,
unref
(
getHeaderTheme
),
{
fixed
:
unref
(
getIsFixed
)
}]
}
>
{
unref
(
getShowInsetHeaderRef
)
&&
<
LayoutHeader
ref=
{
headerElRef
}
/>
}
{
unref
(
showTabsRef
)
&&
<
MultipleTabs
ref=
{
tabElRef
}
/>
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment