From f0bfc8473291fa855108e517490d4077724a8ace Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 29 Oct 2024 10:56:42 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/12843 --- app/src/assets/scss/component/_menu.scss | 7 ++++--- app/src/assets/scss/mobile.scss | 8 ++++++++ app/src/layout/topBar.ts | 2 +- app/src/menus/Menu.ts | 4 ++-- app/src/menus/workspace.ts | 1 + app/src/mobile/menu/index.ts | 2 +- app/src/types/index.d.ts | 1 + 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index b3ca40d51..4329e00fc 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -224,11 +224,12 @@ color: var(--b3-theme-primary); } - &--remove:hover { - color: var(--b3-card-error-color); + &--warning:hover, + &--warning.b3-menu__item--current { + color: var(--b3-theme-error); & > .b3-menu__icon { - color: var(--b3-card-error-color); + color: var(--b3-theme-error); } } diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index f5aa28348..efd8bbad3 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -422,6 +422,14 @@ &__accelerator { display: none; } + + &__item--warning { + color: var(--b3-theme-error); + + & > .b3-menu__icon { + color: var(--b3-theme-error); + } + } } #historyContainer { diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 79a500206..ec282847d 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -54,7 +54,7 @@ export const initBar = (app: App) => {
-
+
diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts index 29e2235c8..4cad076b8 100644 --- a/app/src/menus/Menu.ts +++ b/app/src/menus/Menu.ts @@ -213,8 +213,8 @@ export class MenuItem { if (options.type === "readonly") { this.element.classList.add("b3-menu__item--readonly"); } - if (options.icon === "iconTrashcan") { - this.element.classList.add("b3-menu__item--remove"); + if (options.icon === "iconTrashcan" || options.warning) { + this.element.classList.add("b3-menu__item--warning"); } if (options.element) { diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index ef74cfef0..e73de06b0 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -503,6 +503,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => { id: "safeQuit", label: window.siyuan.languages.safeQuit, icon: "iconQuit", + warning: true, click: () => { exportLayout({ errorExit: true, diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts index 7bfe30b88..3fc4ddf3f 100644 --- a/app/src/mobile/menu/index.ts +++ b/app/src/mobile/menu/index.ts @@ -88,7 +88,7 @@ export const initRightMenu = (app: App) => { ${window.siyuan.languages.dataHistory}
-