diff --git a/app/src/assets/scss/_reset.scss b/app/src/assets/scss/_reset.scss index e3f76f123..053260050 100644 --- a/app/src/assets/scss/_reset.scss +++ b/app/src/assets/scss/_reset.scss @@ -66,6 +66,20 @@ body { } } } + + &.body--window.body--win32 .fullscreen { + & > .protyle-breadcrumb, + & > .block__icons { + padding-right: 126px; + } + } + + &.body--window .fullscreen { + & > .protyle-breadcrumb, + & > .block__icons { + height: 42px; + } + } } ul, diff --git a/app/src/assets/template/app/window.tpl b/app/src/assets/template/app/window.tpl index e0351fd6a..4cab69c8f 100644 --- a/app/src/assets/template/app/window.tpl +++ b/app/src/assets/template/app/window.tpl @@ -10,7 +10,7 @@ - +
diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index 81f112cb7..407158cec 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -397,7 +397,7 @@ export const bazaar = { } else if (bazaarType === "widgets") { url = "/api/bazaar/installBazaarWidget"; } - target.parentElement.insertAdjacentHTML("afterend", ""); + target.parentElement.insertAdjacentHTML("afterend", ''); const name = target.parentElement.getAttribute("data-name"); fetchPost(url, { repoURL: target.parentElement.getAttribute("data-url"), diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts index c3edded50..e443df9a1 100644 --- a/app/src/menus/protyle.ts +++ b/app/src/menus/protyle.ts @@ -1439,7 +1439,7 @@ export const setFold = (protyle: IProtyle, nodeElement: Element, isOpen?: boolea const id = nodeElement.getAttribute("data-node-id"); if (nodeElement.getAttribute("data-type") === "NodeHeading") { if (fold === "0") { - nodeElement.insertAdjacentHTML("beforeend", "
"); + nodeElement.insertAdjacentHTML("beforeend", '
'); transaction(protyle, [{ action: "unfoldHeading", id, diff --git a/app/src/protyle/breadcrumb/action.ts b/app/src/protyle/breadcrumb/action.ts index 38306a26d..be86aa472 100644 --- a/app/src/protyle/breadcrumb/action.ts +++ b/app/src/protyle/breadcrumb/action.ts @@ -46,12 +46,12 @@ export const fullscreen = (element: Element, btnElement?: Element) => { if (isFullscreen) { element.classList.remove("fullscreen"); if (document.querySelector("body").classList.contains("body--win32")) { - document.getElementById("drag").classList.remove("fn__hidden"); + document.getElementById("drag")?.classList.remove("fn__hidden"); } } else { element.classList.add("fullscreen"); if (document.querySelector("body").classList.contains("body--win32")) { - document.getElementById("drag").classList.add("fn__hidden"); + document.getElementById("drag")?.classList.add("fn__hidden"); } } diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index 15f86e9f7..1a9bfb4bb 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -80,7 +80,7 @@ export const exportImage = (id: string) => { foldElement.addEventListener("change", () => { btnsElement[0].setAttribute("disabled", "disabled"); btnsElement[1].setAttribute("disabled", "disabled"); - btnsElement[1].parentElement.insertAdjacentHTML("afterend", "
"); + btnsElement[1].parentElement.insertAdjacentHTML("afterend", '
'); window.siyuan.storage[Constants.LOCAL_EXPORTIMG].keepFold = foldElement.checked; fetchPost("/api/export/exportPreviewHTML", { id, diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index 7d9ab3593..95b42ecbe 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -166,7 +166,7 @@ ${unicode2Emoji(emoji.unicode, true)}`; public genLoading(protyle: IProtyle) { if (this.element.classList.contains("fn__none")) { - this.element.innerHTML = "
"; + this.element.innerHTML = '
'; this.element.classList.remove("fn__none"); const textareaPosition = getSelectionPosition(protyle.wysiwyg.element); setPosition(this.element, textareaPosition.left, textareaPosition.top + 26, 30); diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts index fbeacf9d2..a009d1b6f 100644 --- a/app/src/protyle/util/onGet.ts +++ b/app/src/protyle/util/onGet.ts @@ -194,7 +194,7 @@ const setHTML = (options: { Array.from(protyle.wysiwyg.element.children).forEach((item, index) => { if ((options.expand && index > 2) || (!options.expand && index > 1)) { if ((options.expand && index === 3) || (!options.expand && index === 2)) { - item.insertAdjacentHTML("beforebegin", "
"); + item.insertAdjacentHTML("beforebegin", '
'); } item.classList.add("fn__none"); } diff --git a/app/src/protyle/wysiwyg/renderBacklink.ts b/app/src/protyle/wysiwyg/renderBacklink.ts index 49a3fe70c..a79171f52 100644 --- a/app/src/protyle/wysiwyg/renderBacklink.ts +++ b/app/src/protyle/wysiwyg/renderBacklink.ts @@ -43,7 +43,7 @@ const setBacklinkFold = (html: string, expand: boolean) => { Array.from(tempDom.content.children).forEach((item, index) => { if ((expand && index > 2) || (!expand && index > 1)) { if ((expand && index === 3) || (!expand && index === 2)) { - item.insertAdjacentHTML("beforebegin", "
"); + item.insertAdjacentHTML("beforebegin", '
'); } item.classList.add("fn__none"); }