diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js index 268010d10..79e4afbcc 100644 --- a/app/appearance/icons/ant/icon.js +++ b/app/appearance/icons/ant/icon.js @@ -1,5 +1,14 @@ document.body.insertAdjacentHTML('afterBegin', ` + + + + + + + + + diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html index 90a9f4555..18f6023a0 100644 --- a/app/appearance/icons/index.html +++ b/app/appearance/icons/index.html @@ -28,6 +28,24 @@

SiYuan

+
+ + + + iconDatabase +
+
+ + + + iconBIU +
+
+ + + + iconKeyboardHide +
diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js index e09285b42..58f11e2a1 100644 --- a/app/appearance/icons/material/icon.js +++ b/app/appearance/icons/material/icon.js @@ -1,5 +1,14 @@ document.body.insertAdjacentHTML('afterbegin', ` + + + + + + + + + diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index a340ac6be..9fe192e56 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -245,9 +245,10 @@ &__split { width: 1px; - height: 70%; + height: 28px; background: var(--b3-border-color); align-self: center; + flex-shrink: 0; } button { @@ -258,8 +259,15 @@ svg { height: 16px; width: 16px; + float: left; padding: 12px; color: var(--b3-theme-on-surface); + + &.keyboard__svg--big { + width: 30px; + padding: 4px; + height: 32px; + } } } } diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts index 52f1abb02..4831d0fe3 100644 --- a/app/src/mobile/index.ts +++ b/app/src/mobile/index.ts @@ -15,7 +15,7 @@ import {promiseTransactions} from "../protyle/wysiwyg/transaction"; import {bootSync} from "../dialog/processSystem"; import {initMessage} from "../dialog/message"; import {goBack} from "./util/MobileBackFoward"; -import {hideKeyboardToolbar, showKeyboardToolbar} from "./util/showKeyboardToolbar"; +import {hideKeyboardToolbar, showKeyboardToolbar} from "./util/keyboardToolbar"; import {getLocalStorage} from "../protyle/util/compatibility"; import {openMobileFileById} from "./editor"; import {getSearch} from "../util/functions"; diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index 7e128c4c2..1bff21220 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -17,7 +17,7 @@ import {hasTopClosestByTag} from "../../protyle/util/hasClosest"; import {MobileBacklinks} from "./MobileBacklinks"; import {MobileBookmarks} from "./MobileBookmarks"; import {MobileTags} from "./MobileTags"; -import {hideKeyboard, hideKeyboardToolbar, initKeyboardToolbar} from "./showKeyboardToolbar"; +import {hideKeyboard, hideKeyboardToolbar, initKeyboardToolbar} from "./keyboardToolbar"; import {getSearch} from "../../util/functions"; import {syncGuide} from "../../sync/syncGuide"; diff --git a/app/src/mobile/util/showKeyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts similarity index 65% rename from app/src/mobile/util/showKeyboardToolbar.ts rename to app/src/mobile/util/keyboardToolbar.ts index 911bf0ffe..1f44a7582 100644 --- a/app/src/mobile/util/showKeyboardToolbar.ts +++ b/app/src/mobile/util/keyboardToolbar.ts @@ -37,24 +37,45 @@ export const showKeyboardToolbar = (bottom = 0) => { export const renderKeyboardToolbar = (protyle: IProtyle, range: Range) => { const toolbarElement = document.getElementById("keyboardToolbar"); - toolbarElement.innerHTML = `
- - - - - - - - - - - - - -
- + const inlineHTML = ` + + + + + + + + + + + + + + + + + +` + const html = ` + + -` + + + + + + + + + +` + toolbarElement.innerHTML = `
+
${html}
+
${inlineHTML}
+
+ +` } export const hideKeyboardToolbar = () => { diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index 53e48ec88..760998a20 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -16,7 +16,7 @@ import {Dialog} from "../../dialog"; import {syncGuide} from "../../sync/syncGuide"; import {openCard} from "../../card/openCard"; import {pathPosix} from "../../util/pathName"; -import {hideKeyboard, hideKeyboardToolbar} from "./showKeyboardToolbar"; +import {hideKeyboard, hideKeyboardToolbar} from "./keyboardToolbar"; const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) => { closePanel(); diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts index 0cfee2e58..e3d2216c5 100644 --- a/app/src/protyle/hint/extend.ts +++ b/app/src/protyle/hint/extend.ts @@ -39,7 +39,7 @@ export const hintSlash = (key: string, protyle: IProtyle) => { }, { filter: ["属性试图", "shuxingshitu", "sxst", "attribute view"], value: '
', - html: `
TODO
`, + html: `
TODO
`, }, { filter: ["文档", "子文档", "wendang", "wd", "ziwendang", "zwd", "xjwd"], value: Constants.ZWSP + 4, diff --git a/app/src/protyle/index.ts b/app/src/protyle/index.ts index a3954717a..19d0338b8 100644 --- a/app/src/protyle/index.ts +++ b/app/src/protyle/index.ts @@ -25,7 +25,6 @@ import {Background} from "./header/Background"; import {disabledProtyle, enableProtyle, onGet} from "./util/onGet"; import {reloadProtyle} from "./util/reload"; import {renderBacklink} from "./wysiwyg/renderBacklink"; -import {showKeyboardToolbar} from "../mobile/util/showKeyboardToolbar"; export class Protyle { diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 1805f0313..3c8712691 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -52,7 +52,7 @@ import {pushBack} from "../../util/backForward"; import {openAsset, openBy, openFileById} from "../../editor/util"; import {openGlobalSearch} from "../../search/util"; /// #else -import {renderKeyboardToolbar} from "../../mobile/util/showKeyboardToolbar"; +import {renderKeyboardToolbar} from "../../mobile/util/keyboardToolbar"; /// #endif import {BlockPanel} from "../../block/Panel"; import {isCtrl, openByMobile} from "../util/compatibility";