diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index db35be544..7646b9635 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -39,13 +39,14 @@ .b3-menu { &__submenu { - top: 45px; + top: 57px; left: 0; bottom: 0; max-height: none; right: 0; box-shadow: none; border: 0; + padding: 0; } &__item { @@ -64,6 +65,10 @@ line-height: 24px; padding-left: 16px; } + + .color__square { + margin: 0 16px 0 8px; + } } &__title { @@ -141,13 +146,9 @@ padding: 4px; align-content: flex-start; - .b3-menu__icon { - display: none; - } - .b3-menu__item { - width: auto; - padding: 4px; + min-width: auto; + margin-top: 7px; } .b3-menu__label { diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts index 47c1d13bc..913e90340 100644 --- a/app/src/menus/Menu.ts +++ b/app/src/menus/Menu.ts @@ -50,6 +50,8 @@ export class Menu { itemElement.classList.add("b3-menu__item--show"); if (!this.element.classList.contains("b3-menu--fullscreen")) { this.showSubMenu(subMenuElement); + } else { + this.element.scrollTop = 0 } }); } diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index 999fc38d8..f540c10f8 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -668,7 +668,9 @@ export class Gutter { submenu: this.genCardStyle(selectsElement, protyle).concat(this.genFontStyle(selectsElement, protyle)).concat(this.genBGStyle(selectsElement, protyle)) }).element; window.siyuan.menus.menu.append(appearanceElement); - appearanceElement.lastElementChild.classList.add("b3-menu__submenu--row"); + if (!isMobile()) { + appearanceElement.lastElementChild.classList.add("b3-menu__submenu--row"); + } this.genAlign(selectsElement, protyle); this.genWidths(selectsElement, protyle); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); @@ -1439,7 +1441,9 @@ export class Gutter { submenu: this.genCardStyle([nodeElement], protyle).concat(this.genFontStyle([nodeElement], protyle)).concat(this.genBGStyle([nodeElement], protyle)) }).element; window.siyuan.menus.menu.append(appearanceElement); - appearanceElement.lastElementChild.classList.add("b3-menu__submenu--row"); + if (!isMobile()) { + appearanceElement.lastElementChild.classList.add("b3-menu__submenu--row"); + } this.genAlign([nodeElement], protyle); this.genWidths([nodeElement], protyle); } @@ -1588,12 +1592,14 @@ export class Gutter { private genBGStyle(nodeElements: Element[], protyle: IProtyle) { const styles: IMenu[] = []; + const isM = isMobile(); ["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) => { styles.push({ - label: `