From b813364b99a36c0b74fd61d57d9cf61a05393369 Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 12 May 2017 17:45:33 +0800 Subject: [PATCH] refine css && refine sidebar --- src/styles/index.scss | 7 +++++++ src/views/layout/Layout.vue | 9 +++------ src/views/layout/Sidebar.vue | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index a81af92f..e566c382 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -221,6 +221,13 @@ code { z-index: 1000 !important; } +//refine simplemde +.simplemde-container{ + .editor-toolbar.fullscreen,.CodeMirror-fullscreen{ + z-index: 1003; + } +} + //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 .el-dialog { transform: none; diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index a5a011ee..168f8f81 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -54,7 +54,6 @@ height: 100%; width: 100%; &.hideSidebar { - padding-left: 40px; .sidebar-wrapper { transform: translate(-140px, 0); .sidebar-container { @@ -62,14 +61,13 @@ } &:hover { transform: translate(0, 0); - z-index: 1001; .sidebar-container { transform: translate(0, 0); } } } .main-container{ - padding-left: 0px; + margin-left: 40px; } } .sidebar-wrapper { @@ -78,7 +76,7 @@ top: 0; bottom: 0; left: 0; - z-index: 2; + z-index: 1001; overflow-x: hidden; transition: all .28s ease-out; @include scrollBar; @@ -87,10 +85,9 @@ transition: all .28s ease-out; } .main-container { - width: 100%; min-height: 100%; transition: all .28s ease-out; - padding-left: 180px; + margin-left: 180px; } } diff --git a/src/views/layout/Sidebar.vue b/src/views/layout/Sidebar.vue index ec80856f..b180968a 100644 --- a/src/views/layout/Sidebar.vue +++ b/src/views/layout/Sidebar.vue @@ -1,5 +1,5 @@