diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index e3a6fa1c3..2ffd2bd21 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -55,9 +55,6 @@ ctrl+p 搜索: 202 // 需大于 .block__popover .b3-menu: 210 -// 需大于 mobile .status -.keyboard: 222 - // 需小于 .b3-dialog 关于中的锁屏密码设置 #menu & .side-panel: 220 @@ -65,6 +62,9 @@ ctrl+p 搜索: 202 // 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069 .b3-dialog: 305 +// 需大于 mobile .status、.b3-dialog +.keyboard: 306 + // 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107 // 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254 .b3-menu: 310 diff --git a/app/src/assets/scss/component/_list.scss b/app/src/assets/scss/component/_list.scss index 957747c64..d3e61e271 100644 --- a/app/src/assets/scss/component/_list.scss +++ b/app/src/assets/scss/component/_list.scss @@ -42,6 +42,7 @@ &-item { line-height: 28px; + min-height: 28px; padding: 1px 4px; display: flex; cursor: pointer; diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 15aed80d1..f6d0fb31c 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -253,7 +253,7 @@ box-sizing: border-box; height: 42px; background: var(--b3-theme-background); - z-index: 222; + z-index: 306; display: flex; border-top: 1px solid var(--b3-theme-surface-lighter); overflow: hidden; diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts index 65bb58fbc..91880e973 100644 --- a/app/src/mobile/menu/search.ts +++ b/app/src/mobile/menu/search.ts @@ -179,7 +179,7 @@ ${unicode2Emoji(childItem.ial.icon, false, "b3-list-item__graphic", true)} ${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)} ${item.content} - + `; } }); @@ -350,7 +350,7 @@ const initSearchEvent = (element: Element, config: ISearchOption) => { event.stopPropagation(); event.preventDefault(); break; - } else if (type === "include") { + } else if (type === "include" && !target.hasAttribute("disabled")){ target.classList.toggle("toolbar__icon--active"); if (target.classList.contains("toolbar__icon--active")) { config.idPath.forEach((item, index) => { @@ -486,7 +486,7 @@ export const popSearch = (config = window.siyuan.storage[Constants.LOCAL_SEARCHD html: `