diff --git a/app/src/assets/scss/_layout.scss b/app/src/assets/scss/_layout.scss index c693fe15a..994961231 100644 --- a/app/src/assets/scss/_layout.scss +++ b/app/src/assets/scss/_layout.scss @@ -26,8 +26,11 @@ } &.layout--floatr { - border-left: 1px solid var(--b3-border-color); + border: 1px solid var(--b3-border-color); box-shadow: -8px 0px 24px rgb(140 149 159 / 20%); + border-right: 0; + border-radius: 8px 0 0 8px; + overflow: hidden; } &.layout--floatt { diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts index a027e1c6e..d27765c5c 100644 --- a/app/src/layout/dock/index.ts +++ b/app/src/layout/dock/index.ts @@ -157,9 +157,7 @@ top: 112px;bottom: 82px;left:0`); } else if (this.position === "Right") { this.layout.element.setAttribute("style", `width:${this.layout.element.clientWidth}px; opacity:${show ? 1 : 0}; -right:0; -top: ${document.getElementById("toolbar").offsetHeight + document.getElementById("dockTop").offsetHeight}px; -bottom: ${document.getElementById("status").offsetHeight + document.getElementById("dockBottom").offsetHeight}px;`); +right:0;top: 112px;bottom: 82px;`); } else { this.layout.element.setAttribute("style", `height:${this.layout.element.clientHeight}px; opacity:${show ? 1 : 0}; diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts index 6bc15bfc3..a208ab58b 100644 --- a/app/src/layout/dock/util.ts +++ b/app/src/layout/dock/util.ts @@ -88,13 +88,10 @@ export const openOutline = (protyle: IProtyle) => { export const resetFloatDockSize = () => { if (!window.siyuan.layout.leftDock.pin && window.siyuan.layout.leftDock.layout.element.style.opacity === "1") { - window.siyuan.layout.leftDock.showDock(true); + window.siyuan.layout.leftDock.showDock(true); } - if (!window.siyuan.layout.rightDock.pin) { - window.siyuan.layout.rightDock.resetDockPosition(window.siyuan.layout.rightDock.layout.element.style.opacity === "1") - if (window.siyuan.layout.rightDock.layout.element.style.opacity === "1") { - window.siyuan.layout.rightDock.showDock(true); - } + if (!window.siyuan.layout.rightDock.pin && window.siyuan.layout.rightDock.layout.element.style.opacity === "1") { + window.siyuan.layout.rightDock.showDock(true); } if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity === "1") { window.siyuan.layout.topDock.showDock(true)