From c53fb7fbb12d8f9fdbb2b3662ca113311dfd8d70 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 2 Nov 2017 15:51:29 +0800
Subject: [PATCH] style:refine sidebar css

---
 src/components/TodoList/index.scss |  5 +++-
 src/styles/sidebar.scss            | 40 +++++++++++++++++++++++++++++-
 src/views/layout/Layout.vue        | 34 +++----------------------
 3 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/src/components/TodoList/index.scss b/src/components/TodoList/index.scss
index 8ed13d73..4ee9aeb2 100644
--- a/src/components/TodoList/index.scss
+++ b/src/components/TodoList/index.scss
@@ -4,10 +4,13 @@
 	color: #4d4d4d;
 	min-width: 230px;
 	max-width: 550px;
-	margin: 40PX auto 0;
+	margin: 40px auto 0;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 	font-weight: 300;
+	background: #fff;
+	z-index: 1;
+	position: relative;
 	button {
 		margin: 0;
 		padding: 0;
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index a41a033e..4ec656ba 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -1,4 +1,38 @@
+// 主体区域
+.main-container {
+  min-height: 100%;
+  transition: margin-left 0.28s;
+  margin-left: 180px;
+}
+
 // 侧边栏
+.hideSidebar {
+  .sidebar-container {
+    width: 36px!important; // overflow: inherit;
+  }
+  .main-container {
+    margin-left: 36px;
+  }
+}
+
+// .horizontal-collapse-transition{
+//   transition: width 0.28s!important;
+// }
+.sidebar-container {
+  // transition: width 0.28s ease-out;
+  transition: width 0.28s!important;
+  width: 180px!important;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001; // overflow-y: auto;
+  &::-webkit-scrollbar {
+    display: none
+  }
+}
+
 .sidebar-container>.el-menu {
   width: 100%!important;
   min-height: 100%;
@@ -66,7 +100,7 @@
       text-align: left;
       text-indent: 20px;
       top: 0px;
-      background-color: #1f2d3d;
+      background-color: #2B2C2D!important;
       opacity: 1;
     }
   }
@@ -74,4 +108,8 @@
 
 .el-submenu .el-menu-item {
   min-width: 180px!important;
+  background-color: #2B2C2D!important;
+  &:hover {
+    background-color: rgb(67, 74, 80)!important;
+  }
 }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index 45fc7224..4c69a08d 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -31,35 +31,9 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 	@import "src/styles/mixin.scss";
 	.app-wrapper {
-		@include clearfix;
-		position: relative;
-		height: 100%;
-		width: 100%;
-		&.hideSidebar {
-			.sidebar-container{
-				width:36px;
-				overflow: inherit;
-			}
-			.main-container {
-				margin-left: 36px;
-			}
-		}
-		.sidebar-container {
-			transition: width 0.28s ease-out;
-			width: 180px;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			bottom: 0;
-			left: 0;
-			z-index: 1001;
-			overflow-y: auto;
- 			&::-webkit-scrollbar {display:none}
-		}
-		.main-container {
-			min-height: 100%;
-			transition: margin-left 0.28s ease-out;
-			margin-left: 180px;
-		}
+	  @include clearfix;
+	  position: relative;
+	  height: 100%;
+	  width: 100%;
 	}
 </style>