zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refine css && refine sidebar

This commit is contained in:
Pan 2017-05-12 17:45:33 +08:00
parent b7f96a0ece
commit b813364b99
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/styles/index.scss
View File

@ -221,6 +221,13 @@ code {
z-index: 1000 !important; z-index: 1000 !important;
} }
//refine simplemde
.simplemde-container{
.editor-toolbar.fullscreen,.CodeMirror-fullscreen{
z-index: 1003;
}
}
//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
.el-dialog { .el-dialog {
transform: none; transform: none;

9
src/views/layout/Layout.vue
View File

@ -54,7 +54,6 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
&.hideSidebar { &.hideSidebar {
padding-left: 40px;
.sidebar-wrapper { .sidebar-wrapper {
transform: translate(-140px, 0); transform: translate(-140px, 0);
.sidebar-container { .sidebar-container {
@ -62,14 +61,13 @@
} }
&:hover { &:hover {
transform: translate(0, 0); transform: translate(0, 0);
z-index: 1001;
.sidebar-container { .sidebar-container {
transform: translate(0, 0); transform: translate(0, 0);
} }
} }
} }
.main-container{ .main-container{
padding-left: 0px; margin-left: 40px;
} }
} }
.sidebar-wrapper { .sidebar-wrapper {
@ -78,7 +76,7 @@
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 2; z-index: 1001;
overflow-x: hidden; overflow-x: hidden;
transition: all .28s ease-out; transition: all .28s ease-out;
@include scrollBar; @include scrollBar;
@ -87,10 +85,9 @@
transition: all .28s ease-out; transition: all .28s ease-out;
} }
.main-container { .main-container {
width: 100%;
min-height: 100%; min-height: 100%;
transition: all .28s ease-out; transition: all .28s ease-out;
padding-left: 180px; margin-left: 180px;
} }
} }
</style> </style>

2
src/views/layout/Sidebar.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-menu mode="vertical" theme="dark" :default-active="$route.path"> <el-menu :unique-opened='true' mode="vertical" theme="dark" :default-active="$route.path">
<template v-for="item in permissionRoutes" v-if="!item.hidden"> <template v-for="item in permissionRoutes" v-if="!item.hidden">
<el-submenu :index="item.name" v-if="!item.noDropdown"> <el-submenu :index="item.name" v-if="!item.noDropdown">
<template slot="title"> <template slot="title">