diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts index c6a944cb1..2cb14f66b 100644 --- a/app/src/mobile/util/keyboardToolbar.ts +++ b/app/src/mobile/util/keyboardToolbar.ts @@ -32,23 +32,23 @@ const getSlashItem = (value: string, icon: string, text: string, focus = "false" export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => { let colorHTML = ""; - ["var(--b3-font-color1)", "var(--b3-font-color2)", "var(--b3-font-color3)", "var(--b3-font-color4)", + ["", "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)", "var(--b3-font-color9)", "var(--b3-font-color10)", "var(--b3-font-color11)", "var(--b3-font-color12)", "var(--b3-font-color13)"].forEach((item, index) => { colorHTML += ` - A - ${window.siyuan.languages.colorFont} ${index + 1} + A + ${window.siyuan.languages.colorFont} ${item?index + 1:window.siyuan.languages.default} `; }); let bgHTML = ""; - ["var(--b3-font-background1)", "var(--b3-font-background2)", "var(--b3-font-background3)", "var(--b3-font-background4)", + ["","var(--b3-font-background1)", "var(--b3-font-background2)", "var(--b3-font-background3)", "var(--b3-font-background4)", "var(--b3-font-background5)", "var(--b3-font-background6)", "var(--b3-font-background7)", "var(--b3-font-background8)", "var(--b3-font-background9)", "var(--b3-font-background10)", "var(--b3-font-background11)", "var(--b3-font-background12)", "var(--b3-font-background13)"].forEach((item, index) => { bgHTML += ` - A - ${window.siyuan.languages.colorPrimary} ${index + 1} + A + ${window.siyuan.languages.colorPrimary} ${item?index + 1:window.siyuan.languages.default} `; }); @@ -73,14 +73,14 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => { switch (lastFontStatus[0]) { case "color": lastColorHTML += ` - A - ${window.siyuan.languages.colorFont} ${parseInt(lastFontStatus[1].replace("var(--b3-font-color", "")) + 1} + A + ${window.siyuan.languages.colorFont} ${lastFontStatus[1] ? parseInt(lastFontStatus[1].replace("var(--b3-font-color", "")) + 1 : window.siyuan.languages.default} `; break; case "backgroundColor": lastColorHTML += ` - A - ${window.siyuan.languages.colorPrimary} ${parseInt(lastFontStatus[1].replace("var(--b3-font-background", "")) + 1} + A + ${window.siyuan.languages.colorPrimary} ${lastFontStatus[1] ? parseInt(lastFontStatus[1].replace("var(--b3-font-background", "")) + 1 : window.siyuan.languages.default} `; break; case "style2": @@ -101,10 +101,17 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => { } break; case "style1": - lastColorHTML += ` + if (lastFontStatus[1]) { + lastColorHTML += ` A ${window.siyuan.languages[lastFontStatus[2].replace("var(--b3-card-", "").replace("-color)", "") + "Style"]} `; + } else { + lastColorHTML += ` + A + ${window.siyuan.languages.color} ${window.siyuan.languages.default} +`; + } break; case "clear": lastColorHTML += ` @@ -132,6 +139,10 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => { utilElement.innerHTML = `${lastColorHTML} ${window.siyuan.languages.color} + + A + ${window.siyuan.languages.color} ${window.siyuan.languages.default} + A ${window.siyuan.languages.errorStyle}