From 209e6818b0fcf6287bd4319c3f278360a99c6e9a Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 8 Apr 2024 22:56:33 +0800 Subject: [PATCH 1/4] :lipstick: fix https://github.com/siyuan-note/siyuan/issues/10887 --- app/src/assets/scss/business/_av.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 53f577a083..80a458ab15 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -42,6 +42,10 @@ .layout-tab-bar { background-color: transparent; font-size: 87.5%; + + .item__text { + padding-left: 5px; + } } } @@ -268,7 +272,7 @@ } &--header { - padding: 5px; + padding: 5px 8px; display: flex; align-items: center; transition: background 20ms ease-in 0s; From 8b5c27f05487903686812632b3662b06d038f418 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 9 Apr 2024 08:22:21 +0800 Subject: [PATCH 2/4] :bug: fix https://github.com/siyuan-note/siyuan/issues/10941 --- app/src/protyle/toolbar/InlineMath.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/protyle/toolbar/InlineMath.ts b/app/src/protyle/toolbar/InlineMath.ts index 80b6224891..5a8202b9a8 100644 --- a/app/src/protyle/toolbar/InlineMath.ts +++ b/app/src/protyle/toolbar/InlineMath.ts @@ -19,7 +19,7 @@ export class InlineMath extends ToolbarItem { let mathElement = hasClosestByAttribute(range.startContainer, "data-type", "inline-math") as Element; if (!mathElement && range.startContainer.nodeType !== 3 && range.startContainer.childNodes[range.startOffset]) { const previousSibling = hasPreviousSibling(range.startContainer.childNodes[range.startOffset]) as HTMLElement; - if (previousSibling && previousSibling.getAttribute("data-type").indexOf("inline-math") > -1) { + if (previousSibling && previousSibling.nodeType !==3 && previousSibling.getAttribute("data-type").indexOf("inline-math") > -1) { mathElement = previousSibling; } } From 7089ab5de6b68f7acb865291e4c0c6c1ed0e9e66 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 9 Apr 2024 08:24:34 +0800 Subject: [PATCH 3/4] :rotating_light: --- app/src/layout/Wnd.ts | 2 +- app/src/layout/dock/Outline.ts | 2 +- app/src/layout/dock/util.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts index 05ad3e1bac..1b9d56ec98 100644 --- a/app/src/layout/Wnd.ts +++ b/app/src/layout/Wnd.ts @@ -716,7 +716,7 @@ export class Wnd { // 关闭分屏页签后光标消失 const editors = getAllModels().editor; if (editors.length === 0) { - clearOBG() + clearOBG(); } else { editors.forEach(item => { if (!item.element.classList.contains("fn__none")) { diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts index 8ab44cae6d..352dad3958 100644 --- a/app/src/layout/dock/Outline.ts +++ b/app/src/layout/dock/Outline.ts @@ -236,7 +236,7 @@ export class Outline extends Model { documentSelf.ondragstart = () => false; let ghostElement: HTMLElement; let selectItem: HTMLElement; - let editor: IProtyle + let editor: IProtyle; getAllModels().editor.find(editItem => { if (editItem.editor.protyle.block.rootID === this.blockId) { editor = editItem.editor.protyle; diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts index d0e15b30c9..d1b045d773 100644 --- a/app/src/layout/dock/util.ts +++ b/app/src/layout/dock/util.ts @@ -233,4 +233,4 @@ export const clearOBG = () => { item.blockId = ""; item.render(undefined); }); -} +}; From 58038ae90df9ebf48705d67ee190a7043f11c325 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 9 Apr 2024 08:32:16 +0800 Subject: [PATCH 4/4] :bookmark: Release v3.0.8 --- .github/workflows/dockerimage.yml | 2 +- app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- kernel/util/working.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 08e9f18686..c11c2a9e3f 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -49,4 +49,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.7 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.8 . \ No newline at end of file diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index 0b9be71c5c..4f015d56cf 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.0.8.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 2250398383..9394a1ed38 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "3.0.7", + "version": "3.0.8", "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/util/working.go b/kernel/util/working.go index d3941f7e90..4f623f9eed 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -43,7 +43,7 @@ import ( var Mode = "prod" const ( - Ver = "3.0.7" + Ver = "3.0.8" IsInsider = false )