diff --git a/app/src/assets/scss/protyle/_toolbar.scss b/app/src/assets/scss/protyle/_toolbar.scss index c5e8fc41e..68efa97ca 100644 --- a/app/src/assets/scss/protyle/_toolbar.scss +++ b/app/src/assets/scss/protyle/_toolbar.scss @@ -62,7 +62,7 @@ background-color: var(--b3-menu-background); z-index: 5; overflow: auto; - max-height: 402px; + max-height: min(402px, 40vh); // 不能使用,否则 hint emoji 出现双滚动条 box-sizing: border-box; padding: 8px 0; display: flex; diff --git a/app/src/dialog/index.ts b/app/src/dialog/index.ts index 0e1712dc3..dda50dfcb 100644 --- a/app/src/dialog/index.ts +++ b/app/src/dialog/index.ts @@ -50,7 +50,7 @@ export class Dialog { } this.element.innerHTML = `
-
+
${options.title || ""}
${options.content}
diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index 7d50a0dd6..88433fc9a 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -374,8 +374,8 @@ ${genHintItemHTML(item)} } lazyLoadEmojiImg(panelElement); } else { - // 402 和 .protyle-hint 保持一致,用户 /emoji - this.element.innerHTML = `
+ // /emoji 菜单,min(402px,40vh) 和 .protyle-hint 保持一致,否则不显示底部导航栏 + this.element.innerHTML = `
${filterEmoji(value, 256)}
${[