From 3fd95725cf71e2137d5993b2e32f972de0cddd43 Mon Sep 17 00:00:00 2001
From: PiEgg <marksz@teamsz.xyz>
Date: Mon, 30 Dec 2019 22:45:50 +0800
Subject: [PATCH] :bug: Fix: settingPage && miniPage style in windows

---
 src/renderer/layouts/SettingPage.vue |  2 +-
 src/renderer/pages/MiniPage.vue      |  3 ++-
 yarn.lock                            | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/renderer/layouts/SettingPage.vue b/src/renderer/layouts/SettingPage.vue
index e9c25fc..144f412 100644
--- a/src/renderer/layouts/SettingPage.vue
+++ b/src/renderer/layouts/SettingPage.vue
@@ -334,12 +334,12 @@ $darwinBg = transparentify(#172426, #000, 0.7)
       position absolute
       top 2px
       right 4px
-      width 60px
       z-index 10000
       -webkit-app-region no-drag
       i
         cursor pointer
         font-size 16px
+        margin-left 5px
       .el-icon-minus
         &:hover
           color #409EFF
diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue
index 7a6741f..2ef5c46 100644
--- a/src/renderer/pages/MiniPage.vue
+++ b/src/renderer/pages/MiniPage.vue
@@ -23,12 +23,13 @@ import {
   IpcRendererEvent,
   remote
 } from 'electron'
+import path from 'path'
 @Component({
   name: 'mini-page',
   mixins: [mixin]
 })
 export default class extends Vue {
-  logo = 'static/squareLogo.png'
+  logo = path.join(process.env.BASE_URL as string, 'squareLogo.png')
   dragover = false
   progress = 0
   showProgress = false
diff --git a/yarn.lock b/yarn.lock
index d305645..c5e256c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2872,8 +2872,8 @@ commander@~2.8.1:
 
 comment-json@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npm.taobao.org/comment-json/download/comment-json-2.3.1.tgz#40f24f573ffece9b9a87806244c330d614a32604"
-  integrity sha1-QPJPVz/+zpuah4BiRMMw1hSjJgQ=
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-2.3.1.tgz#40f24f573ffece9b9a87806244c330d614a32604"
+  integrity sha512-JC3n3NngL0g8mhblclcLdGHaTaowrfWb4YMzJQ2HINtWTtQCmuheNzJ2POXUL0AHbmI9Omli9VPNMBsrdQSZeA==
   dependencies:
     core-util-is "^1.0.2"
     esprima "^4.0.1"
@@ -5628,8 +5628,8 @@ has-flag@^4.0.0:
 
 has-own-prop@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npm.taobao.org/has-own-prop/download/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
-  integrity sha1-8PldWPZYBPXSGNsyVju4W44EF68=
+  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
+  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
@@ -8278,8 +8278,8 @@ performance-now@^2.1.0:
 
 picgo@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.npm.taobao.org/picgo/download/picgo-1.4.3.tgz#6c3140d21415d96489a784c155d8d45b6a91adb5"
-  integrity sha1-bDFA0hQV2WSJp4TBVdjUW2qRrbU=
+  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.3.tgz#6c3140d21415d96489a784c155d8d45b6a91adb5"
+  integrity sha512-MqzMu5tNBXI//K0XQ/hyk533Lk2hcjPsvhW3W/i4+TyrZ/ajxNX9of27uwYUk3JWiNQ/LYqzZAAsMV7CwBx2ow==
   dependencies:
     chalk "^2.4.1"
     commander "^2.17.0"