Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 01:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/9638

Browse source
This commit is contained in:
Vanessa 2023-11-13 09:31:57 +08:00
parent e597a68405
commit 1c6490002f
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/assets/scss/base.scss
View file

@ -84,6 +84,8 @@ html {
& > .block__icons > .fn__flex-1 { & > .block__icons > .fn__flex-1 {
-webkit-app-region: drag; -webkit-app-region: drag;
min-width: 32px; min-width: 32px;
height: 100%;
box-sizing: border-box;
&:hover { &:hover {
border-radius: var(--b3-border-radius-b); border-radius: var(--b3-border-radius-b);
@ -316,7 +318,8 @@ html {
} }
.file-tree { .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; opacity: 1;
} }

4
app/src/assets/scss/util/_reset.scss
View file

@ -68,6 +68,10 @@ body {
padding-left: 10px; padding-left: 10px;
padding-right: 108px; padding-right: 108px;
} }
& > .block__icons > .search__label {
right: 108px;
}
} }
} }

4
app/src/card/openCard.ts
View file

@ -39,8 +39,8 @@ export const genCardHTML = (options: {
<svg><use xlink:href="#iconRiffCard"></use></svg> <svg><use xlink:href="#iconRiffCard"></use></svg>
</div> </div>
<span class="fn__space"></span> <span class="fn__space"></span>
<span class="fn__flex-1 fn__flex-center resize__move">${window.siyuan.languages.riffCard}</span>`} <span class="fn__flex-center">${window.siyuan.languages.riffCard}</span>`}
<span class="fn__space"></span> <span class="fn__space fn__flex-1 resize__move" style="min-height: 100%"></span>
<div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.blocks.length === 0 ? " fn__none" : ""}">1/${options.blocks.length}</span></div> <div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.blocks.length === 0 ? " fn__none" : ""}">1/${options.blocks.length}</span></div>
<div class="fn__space"></div> <div class="fn__space"></div>
<div data-id="${options.id || ""}" data-cardtype="${options.cardType}" data-type="filter" class="block__icon block__icon--show"> <div data-id="${options.id || ""}" data-cardtype="${options.cardType}" data-type="filter" class="block__icon block__icon--show">

11
app/src/layout/dock/index.ts
View file

@ -331,12 +331,12 @@ export class Dock {
} else { } else {
this.layout.element.style.height = "0px"; 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.resizeElement.classList.add("fn__none");
this.hideDock(); this.hideDock();
} }
if ((type === "graph" || type === "globalGraph") && this.layout.element.querySelector(".fullscreen")) {
document.getElementById("drag")?.classList.remove("fn__hidden");
}
// 关闭 dock 后设置光标 // 关闭 dock 后设置光标
if (!document.querySelector(".layout__center .layout__wnd--active")) { if (!document.querySelector(".layout__center .layout__wnd--active")) {
const currentElement = document.querySelector(".layout__center .layout-tab-bar .item--focus"); const currentElement = document.querySelector(".layout__center .layout-tab-bar .item--focus");
@ -483,9 +483,8 @@ export class Dock {
} else { } else {
this.layout.element.style.height = this.getMaxSize() + "px"; this.layout.element.style.height = this.getMaxSize() + "px";
} }
if ((type === "graph" || type === "globalGraph") && if ((type === "graph" || type === "globalGraph") && this.layout.element.querySelector(".fullscreen")) {
document.querySelector("body").classList.contains("body--win32") && this.layout.element.querySelector(".fullscreen")) { document.getElementById("drag")?.classList.add("fn__hidden");
document.getElementById("drag").classList.add("fn__hidden");
} }
if (this.pin) { if (this.pin) {
this.layout.element.style.opacity = ""; this.layout.element.style.opacity = "";

4
app/src/protyle/breadcrumb/action.ts
View file

@ -38,15 +38,11 @@ export const fullscreen = (element: Element, btnElement?: Element) => {
const isFullscreen = element.className.includes("fullscreen"); const isFullscreen = element.className.includes("fullscreen");
if (isFullscreen) { if (isFullscreen) {
element.classList.remove("fullscreen"); 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 { } else {
element.classList.add("fullscreen"); 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) { if (btnElement) {
if (isFullscreen) { if (isFullscreen) {