Browse Source

fix(menu): fix menu icon style

pull/117/head
vben 6 years ago
parent
commit
1bc237d77a
  1. 3
      CHANGELOG.zh_CN.md
  2. 12
      src/components/Menu/src/index.less
  3. 5
      src/layouts/default/header/LayoutMultipleHeader.less
  4. 3
      src/layouts/default/header/LayoutMultipleHeader.tsx

3
CHANGELOG.zh_CN.md

@ -17,7 +17,8 @@
### 🐛 Bug Fixes
-修复表格 i18n 错误
- 修复表格 i18n 错误
- 修复菜单图标大小不一致
## 2.0.0-rc.12 (2020-11-30)

12
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%);
// }

5
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;

3
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} />}

Loading…
Cancel
Save