github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-12 23:21:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-01-18 22:13:34 +08:00
parent 2ffec98b71
commit 020bdc6ac1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/protyle/gutter/index.ts
View File

@ -1566,7 +1566,7 @@ export class Gutter {
"var(--b3-font-background13)"].forEach((item, index) => {
styles.push({
label: `<div class="fn__flex" data-type="a" aria-label="${window.siyuan.languages.colorPrimary} ${index + 1}">
<span style="background-color:${item};" class="b3-color__square fn__flex-center">A</span>
<span style="background-color:${item};" class="b3-color__square fn__flex-center"></span>
</div>`,
click: () => {
this.genClick(nodeElements, protyle, (e: HTMLElement) => {

8
app/src/protyle/toolbar/Font.ts
View File

@ -33,7 +33,7 @@ export const fontMenu = (protyle: IProtyle) => {
"var(--b3-font-color5)", "var(--b3-font-color6)", "var(--b3-font-color7)", "var(--b3-font-color8)",
"var(--b3-font-color9)", "var(--b3-font-color10)", "var(--b3-font-color11)", "var(--b3-font-color12)",
"var(--b3-font-color13)"].forEach((item) => {
colorHTML += `<button class="b3-color__square" data-type="color" style="background-color:${item}"></button>`;
colorHTML += `<button class="b3-color__square" data-type="color" style="color:${item}">A</button>`;
});
let bgHTML = "";
["var(--b3-font-background1)", "var(--b3-font-background2)", "var(--b3-font-background3)", "var(--b3-font-background4)",
@ -56,10 +56,10 @@ export const fontMenu = (protyle: IProtyle) => {
const lastFontStatus = item.split(Constants.ZWSP);
switch (lastFontStatus[0]) {
case "color":
lastColorHTML += `<button class="b3-color__square b3-tooltips b3-tooltips__s" aria-label="${window.siyuan.languages.colorFont}" data-type="${lastFontStatus[0]}" style="background-color:${lastFontStatus[1]}"></button>`;
lastColorHTML += `<button class="b3-color__square" data-type="${lastFontStatus[0]}" style="color:${lastFontStatus[1]}">A</button>`;
break;
case "backgroundColor":
lastColorHTML += `<button class="b3-color__square b3-tooltips b3-tooltips__s" aria-label="${window.siyuan.languages["--b3-theme-background"]}" data-type="${lastFontStatus[0]}" style="background-color:${lastFontStatus[1]}"></button>`;
lastColorHTML += `<button class="b3-color__square" data-type="${lastFontStatus[0]}" style="background-color:${lastFontStatus[1]}"></button>`;
break;
case "style2":
lastColorHTML += `<button data-type="${lastFontStatus[0]}" class="protyle-font__style" style="-webkit-text-stroke: 0.2px var(--b3-theme-on-background);-webkit-text-fill-color : transparent;">${window.siyuan.languages.hollow}</button>`;
@ -122,7 +122,7 @@ export const fontMenu = (protyle: IProtyle) => {
if (dataType === "clear") {
protyle.toolbar.setInlineMark(protyle, "clear", "range", {type:"text"});
} else {
fontEvent(protyle, dataType, target.style.backgroundColor || target.textContent);
fontEvent(protyle, dataType, target.style.backgroundColor || target.style.color || target.textContent);
}
break;
}