Skip to content

导航菜单名字超出显示省略号，修改通知组件默认样式 #187

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

Merged
merged 2 commits into from
Jun 25, 2019
Merged

导航菜单名字超出显示省略号，修改通知组件默认样式 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b29a3b
style(src/components/layout/SideBar.vue): 菜单文字过长则显示省略号
lucienstar Jun 24, 2019
4098cdc
style(修改通知组件默认样式):
lucienstar Jun 25, 2019
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
30 changes: 30 additions & 0 deletions src/assets/styles/realize/element-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,3 +817,33 @@ $typeMap: (primary:#3963BC,
}
}
}

/* message */
@include b(message) {
@include m(info) {
background-color: #ECF1FF;
border-color: #97B8FF;
.el-message__content {
color: #3963bc;
}
}
& .el-icon-info {
color: #3963BC;
}
}

/* notification */
@include b(notification) {
border: 1px solid #97B8FF;
background-color: #ECF1FF;
@include e(title) {
color: #3963BC;
}

@include e(content) {
color: #3963BC;
}
.el-icon-info {
color: #3963BC;
}
}
14 changes: 10 additions & 4 deletions src/components/layout/SideBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
active-text-color="#1890ff">
<template v-for="(item) in sideBarList">
<el-submenu
class="subMenuContent"
v-if="item.children"
:key="idMap[item.name]"
:index="idMap[item.name]"
Expand All @@ -29,7 +30,7 @@

<!-- 二级菜单 -->
<template v-for="(subItem) in item.children">
<el-submenu v-if="subItem.children" :key="idMap[subItem.name]" :index="idMap[subItem.name]">
<el-submenu v-if="subItem.children" :key="idMap[subItem.name]" :index="idMap[subItem.name]" class="subMenuContent">
<template slot="title">
<i class="iconfont icon-erjizhibiao"></i>
<span slot="title" class="two-folder">{{subItem.title}}</span>
Expand All @@ -41,7 +42,7 @@
:key="idMap[grandchildItem.name]"
:to="grandchildItem.path"
class="circle third">
<el-menu-item :index="idMap[grandchildItem.name]" style="padding-left: 80px;">
<el-menu-item :index="idMap[grandchildItem.name]" style="padding-left: 80px;" class="subMenuContent">
{{grandchildItem.title}}
</el-menu-item>
</router-link>
Expand All @@ -52,7 +53,7 @@
:key="subItem.name"
class="circle"
v-else>
<el-menu-item :index="idMap[subItem.name]" style="padding-left: 60px;">
<el-menu-item :index="idMap[subItem.name]" style="padding-left: 60px;" class="subMenuContent">
{{subItem.title}}
</el-menu-item>
</router-link>
Expand All @@ -62,6 +63,7 @@

<!-- 一级else -->
<el-menu-item
class="subMenuContent"
:index="idMap[item.name]"
@click="goto(item.path)"
v-else
Expand Down Expand Up @@ -152,7 +154,11 @@ export default {
width: 0px;
height: 0px;
}

.subMenuContent {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.logo {
width: $sidebar-width;
height: $header-height;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/LinCmsUi/views/notice/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ export default {
const h = this.$createElement
this.$message({
message: h('p', null, [
h('span', null, '内容可以是 '),
h('i', { style: 'color: teal' }, 'VNode'),
h('span', { style: 'color: #3963BC' }, '内容可以是 '),
h('i', { style: 'color: #3963BC' }, 'VNode'),
]),
})
},
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/LinCmsUi/views/notice/Notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ export default {
const h = this.$createElement
this.$notify({
title: '标题名称',
message: h('i', { style: 'color: teal' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
message: h('i', { style: 'color: #3963BC' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
})
},

Expand Down