Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 优化 Mix 菜单布局时 底部折叠按钮 的样式，与其他菜单布局保持风格一致 #896

Merged
merged 1 commit into from
Jul 13, 2021
Merged

feat: 优化 Mix 菜单布局时 底部折叠按钮 的样式，与其他菜单布局保持风格一致 #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.zh_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### ✨ Features

- **NoticeList** 添加分页、超长自动省略、标题点击事件、标题删除线等功能
- **MixSider** 优化 Mix 菜单布局时 底部折叠按钮 的样式，与其它菜单布局时的风格保持一致

### 🐛 Bug Fixes

Expand Down
16 changes: 9 additions & 7 deletions src/layouts/default/sider/MixSider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
>
<AppLogo :showTitle="false" :class="`${prefixCls}-logo`" />

<Trigger :class="`${prefixCls}-trigger`" />
<LayoutTrigger :class="`${prefixCls}-trigger`" />

<ScrollContainer>
<ul :class="`${prefixCls}-module`">
Expand Down Expand Up @@ -86,7 +86,6 @@
import { SimpleMenu, SimpleMenuTag } from '/@/components/SimpleMenu';
import { Icon } from '/@/components/Icon';
import { AppLogo } from '/@/components/Application';
import Trigger from '../trigger/HeaderTrigger.vue';
import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
import { useDragLine } from './useLayoutSider';
import { useGlobSetting } from '/@/hooks/setting';
Expand All @@ -97,6 +96,7 @@
import clickOutside from '/@/directives/clickOutside';
import { getChildrenMenus, getCurrentParentPath, getShallowMenus } from '/@/router/menus';
import { listenerRouteChange } from '/@/logics/mitt/routeChange';
import LayoutTrigger from '../trigger/index.vue';

export default defineComponent({
name: 'LayoutMixSider',
Expand All @@ -105,7 +105,7 @@
AppLogo,
SimpleMenu,
Icon,
Trigger,
LayoutTrigger,
SimpleMenuTag,
},
directives: {
Expand Down Expand Up @@ -486,17 +486,19 @@
bottom: 0;
left: 0;
width: 100%;
padding: 6px;
padding-left: 12px;
font-size: 18px;
font-size: 14px;
color: rgba(255, 255, 255, 0.65);
text-align: center;
cursor: pointer;
background-color: @sider-dark-bg-color;
background-color: @trigger-dark-bg-color;
height: 36px;
line-height: 36px;
}

&.light &-trigger {
color: rgba(0, 0, 0, 0.65);
background-color: #fff;
border-top: 1px solid #eee;
}

&-menu-list {
Expand Down