Merge 96c6d48146 into 7d6917a5ef

2017-06-13 08:07:49 +00:00
parent 7d6917a5ef 96c6d48146
commit 63ac22fd57
1 changed files with 6 additions and 1 deletions
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -54,17 +54,22 @@
        }
        .sidebar-wrapper {
            width: 180px;
+            height: 100%;
+            overflow: hidden;
            position: fixed;
            top: 0;
            bottom: 0;
            left: 0;
            z-index: 1001;
-            overflow-x: hidden;
            transition: all .28s ease-out;
            @include scrollBar;
        }
        .sidebar-container {
            transition: all .28s ease-out;
+            height: 100%;
+            width: 195px;
+            overflow-x: hidden;
+            overflow-y: scroll;
        }
        .main-container {
            min-height: 100%;