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

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

Browse source
This commit is contained in:
Vanessa 2023-01-27 12:43:15 +08:00
parent b601a9af7c
commit b6e638a77a
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/_toolbar.scss
View file

@ -64,7 +64,7 @@
background-color: var(--b3-menu-background);
padding: 8px;
max-height: 80vh;
z-index: 200;
z-index: 4;
}
&-font {

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

@ -31,12 +31,13 @@
/*
.status: 2
// 需小于 .block__popover
// 需小于 ctrl+p https://github.com/siyuan-note/siyuan/issues/7174
.protyle-util: 4
// 需小于 .block__popover https://github.com/siyuan-note/siyuan/issues/3515
ctrl+p 搜索: 199
// 需小于 .block__popover
.protyle-util: 200
// 引用提示需小于 .block__popover
.protyle-hint: 201

7
app/src/protyle/toolbar/Font.ts
View file

@ -1,7 +1,7 @@
import {getEventName, setStorageVal, updateHotkeyTip} from "../util/compatibility";
import {ToolbarItem} from "./ToolbarItem";
import {setPosition} from "../../util/setPosition";
import {getSelectionPosition} from "../util/selection";
import {focusByRange, getSelectionPosition} from "../util/selection";
import {Constants} from "../../constants";
import {hasClosestByAttribute} from "../util/hasClosest";
@ -21,13 +21,14 @@ export class Font extends ToolbarItem {
protyle.toolbar.subElement.append(fontMenu(protyle));
protyle.toolbar.subElement.classList.remove("fn__none");
protyle.toolbar.subElementCloseCB = undefined;
focusByRange(protyle.toolbar.range);
const position = getSelectionPosition(protyle.wysiwyg.element, protyle.toolbar.range);
setPosition(protyle.toolbar.subElement, position.left, position.top + 18, 26);
});
}
}
export const fontMenu = (protyle: IProtyle) => {
const fontMenu = (protyle: IProtyle) => {
let colorHTML = "";
["var(--b3-font-color1)", "var(--b3-font-color2)", "var(--b3-font-color3)", "var(--b3-font-color4)",
"var(--b3-font-color5)", "var(--b3-font-color6)", "var(--b3-font-color7)", "var(--b3-font-color8)",
@ -97,7 +98,7 @@ export const fontMenu = (protyle: IProtyle) => {
</div>
<div style="margin: 4px 0 2px">${window.siyuan.languages.fontSize}</div>
<div class="fn__flex">
<select class="b3-select">
<select class="b3-select fn__block">
<option ${fontSize === "12px" ? "selected" : ""} value="12px">12px</option>
<option ${fontSize === "13px" ? "selected" : ""} value="13px">13px</option>
<option ${fontSize === "14px" ? "selected" : ""} value="14px">14px</option>