From 1bc237d77a068e99b0e803ab4f16d8bbcf54ff6b Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Thu, 3 Dec 2020 22:05:34 +0800
Subject: [PATCH] fix(menu): fix menu icon style
---
CHANGELOG.zh_CN.md | 3 ++-
src/components/Menu/src/index.less | 12 ++++++++++++
src/layouts/default/header/LayoutMultipleHeader.less | 5 ++++-
src/layouts/default/header/LayoutMultipleHeader.tsx | 3 ++-
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index d430a5a..23c3bbf 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -17,7 +17,8 @@
### 🐛 Bug Fixes
--修复表格 i18n 错误
+- 修复表格 i18n 错误
+- 修复菜单图标大小不一致
## 2.0.0-rc.12 (2020-11-30)
diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less
index 04b3125..3016d53 100644
--- a/src/components/Menu/src/index.less
+++ b/src/components/Menu/src/index.less
@@ -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%);
// }
diff --git a/src/layouts/default/header/LayoutMultipleHeader.less b/src/layouts/default/header/LayoutMultipleHeader.less
index 877e42f..dc426e3 100644
--- a/src/layouts/default/header/LayoutMultipleHeader.less
+++ b/src/layouts/default/header/LayoutMultipleHeader.less
@@ -1,6 +1,9 @@
.multiple-tab-header {
flex: 0 0 auto;
- margin-left: -1px;
+
+ &.dark {
+ margin-left: -1px;
+ }
&.fixed {
position: fixed;
diff --git a/src/layouts/default/header/LayoutMultipleHeader.tsx b/src/layouts/default/header/LayoutMultipleHeader.tsx
index 85c0285..231cf82 100644
--- a/src/layouts/default/header/LayoutMultipleHeader.tsx
+++ b/src/layouts/default/header/LayoutMultipleHeader.tsx
@@ -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} />}
--
libgit2 0.23.3