From 1e2fc52ac964c8418fd0607f072726c05bc1427a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Sat, 9 Mar 2019 11:06:48 +0800
Subject: [PATCH 1/3] remove empty file

---
 src/mock/table.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/mock/table.js

diff --git a/src/mock/table.js b/src/mock/table.js
deleted file mode 100644
index e69de29b..00000000

From 698df4942db8c9d65353dbefb75b383e67f33bb5 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 11 Mar 2019 11:43:07 +0800
Subject: [PATCH 2/3] docs: add link

---
 src/styles/variables.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 50d9b3ef..22689568 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -22,6 +22,7 @@ $subMenuHover:#001528;
 $sideBarWidth: 180px;
 
 // the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
   menuText: $menuText;
   menuActiveText: $menuActiveText;

From 8edf2094986130c57de00f936e242e2c34ad26d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 12 Mar 2019 11:12:28 +0800
Subject: [PATCH 3/3] fix[Sidebar]: fixed collapse animation problem (#1690)

---
 src/styles/sidebar.scss                       | 20 ++++++++++++++-----
 src/styles/variables.scss                     |  2 +-
 src/views/layout/components/Sidebar/index.vue |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 96e89be7..03449706 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -83,19 +83,26 @@
 
   .hideSidebar {
     .sidebar-container {
-      width: 36px !important;
+      width: 54px !important;
     }
 
     .main-container {
-      margin-left: 36px;
+      margin-left: 54px;
+    }
+
+    .svg-icon {
+      margin-right: 0px;
     }
 
     .submenu-title-noDropdown {
-      padding-left: 10px !important;
+      padding: 0 !important;
       position: relative;
 
       .el-tooltip {
-        padding: 0 10px !important;
+        padding: 0 !important;
+        .svg-icon {
+          margin-left: 20px;
+        }
       }
     }
 
@@ -103,7 +110,10 @@
       overflow: hidden;
 
       &>.el-submenu__title {
-        padding-left: 10px !important;
+        padding: 0 !important;
+        .svg-icon {
+          margin-left: 20px;
+        }
 
         .el-submenu__icon-arrow {
           display: none;
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 22689568..98d7b672 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -19,7 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 180px;
+$sideBarWidth: 210px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 11ef4c02..27da29b5 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -6,6 +6,7 @@
       :background-color="variables.menuBg"
       :text-color="variables.menuText"
       :active-text-color="variables.menuActiveText"
+      :collapse-transition="false"
       mode="vertical"
     >
       <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>