From dab4e117112ae750f4641cdf74036713c98ed95d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 17 Jul 2018 22:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9C=80=E5=B0=8F=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 692ad18f16ea371370500b468f3e81d16b4221ca [formerly 692ad18f16ea371370500b468f3e81d16b4221ca [formerly 692ad18f16ea371370500b468f3e81d16b4221ca [formerly 692ad18f16ea371370500b468f3e81d16b4221ca [formerly 1f2e402c0fd6ca95ab0d408320467ccf10f03d63 [formerly df1029a97a703baf0c975a842b8ff983d440129f]]]]]
Former-commit-id: 465945ee4d65422dfcf9d247159d600b717c704b
Former-commit-id: 51355c8dd904e4d885f634327a0a7d4fe798c578
Former-commit-id: 98f9a586aced186c187b2ef5d0c10db27eb565e4 [formerly f30d29dfae071c1fab13fcf7cc79848ef1d6ef54]
Former-commit-id: 9d625075e4bbf85dac942633fe308aabcf69b389
Former-commit-id: 57cc39b178b0fc81b1246e3e0c4c18fd870a401e
Former-commit-id: 39e9eaac43c871a2d9262dabea66819105b91cd7
Former-commit-id: a6cf8eba61ceb3b225305525190bfcf4511d3381
Former-commit-id: 963bb703baecb831263eb52723d1c980925494d8
---
 docs/zh/guide/change-log.md            | 2 ++
 src/assets/style/fixed/base.scss       | 1 -
 src/assets/style/theme/theme-base.scss | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 81db1c67..a9b8d96b 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -7,6 +7,8 @@
 * [ 修改 ] 修复了多标签页无法清除缓存的 bug
 * [ 修改 ] bug fixed [#38](https://github.com/d2-projects/d2-admin/issues/38)
 * [ 修改 ] bug fixed [#41](https://github.com/d2-projects/d2-admin/issues/41)
+* [ 修改 ] 侧边栏和顶栏菜单数据控制转移到 vuex 集中管理
+* [ 修改 ] 页面最小宽度设置
 
 ## v1.1.4
 
diff --git a/src/assets/style/fixed/base.scss b/src/assets/style/fixed/base.scss
index 42507ac7..4ef1dd2d 100644
--- a/src/assets/style/fixed/base.scss
+++ b/src/assets/style/fixed/base.scss
@@ -6,7 +6,6 @@ html, body {
   font-family: "Arial", "Microsoft YaHei", "黑体", "宋体", sans-serif;
   #app {
     @extend %full;
-    overflow: hidden;
     a {
       text-decoration: none;
     }
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index ce56def0..9e63901a 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -2,6 +2,7 @@
 .d2-layout-header-aside-group {
   height: 100%;
   width: 100%;
+  min-width: 1000px;
   background-size: cover;
   background-position: center;
   overflow: hidden;