diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index f7bf45126..157381924 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -84,6 +84,8 @@ html { & > .block__icons > .fn__flex-1 { -webkit-app-region: drag; min-width: 32px; + height: 100%; + box-sizing: border-box; &:hover { border-radius: var(--b3-border-radius-b); @@ -316,7 +318,8 @@ html { } .file-tree { - &:hover .block__icons .block__icon:not([disabled]) { + &:hover .block__icons .block__icon:not([disabled]), + &.fullscreen .block__icons .block__icon:not([disabled]) { opacity: 1; } diff --git a/app/src/assets/scss/util/_reset.scss b/app/src/assets/scss/util/_reset.scss index d6fe3dacd..0cf52ea27 100644 --- a/app/src/assets/scss/util/_reset.scss +++ b/app/src/assets/scss/util/_reset.scss @@ -68,6 +68,10 @@ body { padding-left: 10px; padding-right: 108px; } + + & > .block__icons > .search__label { + right: 108px; + } } } diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index df46e3b8d..cc2f96e7b 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -39,8 +39,8 @@ export const genCardHTML = (options: { - ${window.siyuan.languages.riffCard}`} - + ${window.siyuan.languages.riffCard}`} +
1/${options.blocks.length}
diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts index a9e728ae1..e597278db 100644 --- a/app/src/layout/dock/index.ts +++ b/app/src/layout/dock/index.ts @@ -331,12 +331,12 @@ export class Dock { } else { this.layout.element.style.height = "0px"; } - if (document.querySelector("body").classList.contains("body--win32")) { - document.getElementById("drag").classList.remove("fn__hidden"); - } this.resizeElement.classList.add("fn__none"); this.hideDock(); } + if ((type === "graph" || type === "globalGraph") && this.layout.element.querySelector(".fullscreen")) { + document.getElementById("drag")?.classList.remove("fn__hidden"); + } // 关闭 dock 后设置光标 if (!document.querySelector(".layout__center .layout__wnd--active")) { const currentElement = document.querySelector(".layout__center .layout-tab-bar .item--focus"); @@ -483,9 +483,8 @@ export class Dock { } else { this.layout.element.style.height = this.getMaxSize() + "px"; } - if ((type === "graph" || type === "globalGraph") && - document.querySelector("body").classList.contains("body--win32") && this.layout.element.querySelector(".fullscreen")) { - document.getElementById("drag").classList.add("fn__hidden"); + if ((type === "graph" || type === "globalGraph") && this.layout.element.querySelector(".fullscreen")) { + document.getElementById("drag")?.classList.add("fn__hidden"); } if (this.pin) { this.layout.element.style.opacity = ""; diff --git a/app/src/protyle/breadcrumb/action.ts b/app/src/protyle/breadcrumb/action.ts index 91494f55d..71c0e7125 100644 --- a/app/src/protyle/breadcrumb/action.ts +++ b/app/src/protyle/breadcrumb/action.ts @@ -38,14 +38,10 @@ export const fullscreen = (element: Element, btnElement?: Element) => { const isFullscreen = element.className.includes("fullscreen"); 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"); } if (btnElement) {