Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-24 17:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/7377

Browse source
This commit is contained in:
Vanessa 2023-02-16 09:17:13 +08:00
parent c684787cea
commit 0f6b4bd395
2 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -350,10 +350,6 @@ html {
}
}
#barDock .b3-menu__item:hover {
background-color: var(--b3-list-hover);
}
.fn__space:last-child {
width: 5px;
}

19
app/src/layout/status.ts
View file

@ -15,20 +15,12 @@ import {resetFloatDockSize} from "./dock/util";
export const initStatus = (isWindow = false) => {
/// #if !MOBILE
const allDocks = getAllDocks();
let menuHTML = "";
allDocks.forEach(item => {
menuHTML += `<button class="b3-menu__item" data-type="${item.type}"><svg class="b3-menu__icon""><use xlink:href="#${item.icon}"></use></svg><span class="b3-menu__label">${window.siyuan.languages[item.hotkeyLangId]}</span><span class="b3-menu__accelerator">${updateHotkeyTip(window.siyuan.config.keymap.general[item.hotkeyLangId].custom)}</span></button>`;
});
let barDockHTML = "";
if (!isWindow) {
barDockHTML = `<div id="barDock" class="toolbar__item b3-tooltips b3-tooltips__e${window.siyuan.config.readonly || isWindow ? " fn__none" : ""}" aria-label="${window.siyuan.config.uiLayout.hideDock ? window.siyuan.languages.showDock : window.siyuan.languages.hideDock}">
<svg>
<use xlink:href="#${window.siyuan.config.uiLayout.hideDock ? "iconDock" : "iconHideDock"}"></use>
</svg>
<div class="b3-menu fn__none" style="bottom: 32px;left: 5px">
${menuHTML}
</div>
</div>`;
}
document.getElementById("status").innerHTML = `${barDockHTML}
@ -39,16 +31,6 @@ export const initStatus = (isWindow = false) => {
<div id="statusHelp" class="toolbar__item b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.help}">
<svg><use xlink:href="#iconHelp"></use></svg>
</div>`;
if (!isWindow) {
// 由于点击切换时需隐藏菜单，因此不可使用 CSS
const dockElement = document.getElementById("barDock");
dockElement.addEventListener("mousemove", () => {
dockElement.querySelector(".b3-menu").classList.remove("fn__none");
});
dockElement.addEventListener("mouseleave", () => {
dockElement.querySelector(".b3-menu").classList.add("fn__none");
});
}
document.querySelector("#status").addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target.id !== "status") {
@ -70,7 +52,6 @@ export const initStatus = (isWindow = false) => {
}
});
resizeTabs();
target.querySelector(".b3-menu").classList.add("fn__none");
resetFloatDockSize();
event.stopPropagation();
break;