From ed187f4438d1eafe13b31b87c1bfbeb4a1a00e74 Mon Sep 17 00:00:00 2001
From: Molunerfinn <marksz@teamsz.xyz>
Date: Tue, 26 Jun 2018 00:19:40 +0800
Subject: [PATCH] Fixed: scrollbar bug in ubuntu

---
 src/renderer/App.vue                    | 2 +-
 src/renderer/components/SettingPage.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 7a35a11b..4b32090e 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -18,8 +18,8 @@
     height 100%
     font-family "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif
   #app
-    overflow-x hidden
     user-select none
+    overflow hidden
   .el-button-group
     width 100%
     .el-button
diff --git a/src/renderer/components/SettingPage.vue b/src/renderer/components/SettingPage.vue
index 8eb46a57..98d31977 100644
--- a/src/renderer/components/SettingPage.vue
+++ b/src/renderer/components/SettingPage.vue
@@ -2,7 +2,7 @@
   <div id="setting-page">
     <div class="fake-title-bar">
       PicGo - {{ version }}
-      <div class="handle-bar" v-if="os === 'win32'">
+      <div class="handle-bar" v-if="os !== 'darwin'">
         <i class="el-icon-minus" @click="minimizeWindow"></i>
         <i class="el-icon-close" @click="closeWindow"></i>
       </div>
@@ -50,10 +50,10 @@
         </el-menu>
         <i class="el-icon-info setting-window" @click="openDialog"></i>
       </el-col>
-      <el-col :span="19" :offset="5">
+      <el-col :span="19" :offset="5" style="height: 428px">
         <router-view></router-view>
       </el-col>
-    </el-row> 
+    </el-row>
     <el-dialog
       title="赞助PicGo"
       :visible.sync="visible"