From dd6590160b09609518ad48bd1ea7c40803701be6 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sat, 28 Jan 2023 12:15:38 +0800
Subject: [PATCH] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=AF=E5=B7=A6=E4=B8=8A=E8=A7=92=E7=AA=97=E5=8F=A3=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=A0=8F=E5=BA=94=E7=94=A8=E5=9B=BE=E6=A0=87=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/7184?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/assets/scss/_reset.scss |  2 +-
 app/src/assets/scss/base.scss   | 12 ------------
 app/src/util/onGetConfig.ts     | 16 +++-------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/app/src/assets/scss/_reset.scss b/app/src/assets/scss/_reset.scss
index 899963470..91f61bd41 100644
--- a/app/src/assets/scss/_reset.scss
+++ b/app/src/assets/scss/_reset.scss
@@ -55,7 +55,7 @@ body {
     -webkit-font-smoothing: auto;
 
     .toolbar {
-      padding: 0;
+      padding: 0 0 0 5px;
     }
 
     .fullscreen {
diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index 76b59a3ee..9364408f9 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -198,18 +198,6 @@ progressLoading: 400
     }
   }
 
-  #windowAppIcon {
-    -webkit-app-region: drag;
-    width: 42px;
-    margin-left: 1px;
-    justify-content: center;
-    color: #fff;
-
-    &:hover {
-      color: var(--b3-theme-on-background);
-    }
-  }
-
   #windowControls {
     top: 0;
     z-index: 502;
diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts
index a2ad776ab..4172275d4 100644
--- a/app/src/util/onGetConfig.ts
+++ b/app/src/util/onGetConfig.ts
@@ -183,8 +183,8 @@ export const onGetConfig = (isStart: boolean) => {
 };
 
 export const initBar = () => {
-    const toolbar = document.getElementById("toolbar");
-    toolbar.innerHTML = `
+    const toolbarElement = document.getElementById("toolbar");
+    toolbarElement.innerHTML = `
 <div id="barWorkspace" class="toolbar__item">
     <span class="toolbar__text">${getWorkspaceName()}</span>
     <svg class="toolbar__svg"><use xlink:href="#iconDown"></use></svg>
@@ -211,7 +211,7 @@ export const initBar = () => {
 </div>
 <div class="fn__flex" id="windowControls"></div>`;
     processSync();
-    toolbar.addEventListener("click", (event: MouseEvent) => {
+    toolbarElement.addEventListener("click", (event: MouseEvent) => {
         let target = event.target as HTMLElement;
         while (!target.classList.contains("toolbar")) {
             if (target.id === "barBack") {
@@ -493,16 +493,6 @@ export const initWindow = () => {
     }
     document.body.classList.add("body--win32");
 
-    // 添加应用图标
-    if (!isWindow()) {
-        const toolbarElement = document.getElementById("toolbar");
-        toolbarElement.insertAdjacentHTML("afterbegin", `<div class="toolbar__item" id="windowAppIcon">
-    <svg>
-        <use xlink:href="#iconSiYuan"></use>
-    </svg>
-</div>`);
-    }
-
     // 添加窗口控件
     const controlsHTML = `<div class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}" id="minWindow">
     <svg>