0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/12843

Browse source
This commit is contained in:
Vanessa 2024-10-29 10:56:42 +08:00
parent ab9e2179b4
commit f0bfc84732
7 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/assets/scss/component/_menu.scss
View file

@ -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);
}
}

8
app/src/assets/scss/mobile.scss
View file

@ -422,6 +422,14 @@
&__accelerator {
display: none;
}
&__item--warning {
color: var(--b3-theme-error);
& > .b3-menu__icon {
color: var(--b3-theme-error);
}
}
}
#historyContainer {

2
app/src/layout/topBar.ts
View file

@ -54,7 +54,7 @@ export const initBar = (app: App) => {
<div id="barMode" class="toolbar__item ariaLabel${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.appearanceMode}">
<svg><use xlink:href="#icon${window.siyuan.config.appearance.modeOS ? "Mode" : (window.siyuan.config.appearance.mode === 0 ? "Light" : "Dark")}"></use></svg>
</div>
<div id="barExit" class="toolbar__item ariaLabel${(isInIOS() || isInAndroid()) ? "" : " fn__none"}" aria-label="${window.siyuan.languages.safeQuit}">
<div id="barExit" class="ft__error toolbar__item ariaLabel${(isInIOS() || isInAndroid()) ? "" : " fn__none"}" aria-label="${window.siyuan.languages.safeQuit}">
<svg><use xlink:href="#iconQuit"></use></svg>
</div>
<div id="barMore" class="toolbar__item ariaLabel" aria-label="${window.siyuan.languages.more}">

4
app/src/menus/Menu.ts
View file

@ -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) {

1
app/src/menus/workspace.ts
View file

@ -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,

2
app/src/mobile/menu/index.ts
View file

@ -88,7 +88,7 @@ export const initRightMenu = (app: App) => {
<svg class="b3-menu__icon"><use xlink:href="#iconHistory"></use></svg><span class="b3-menu__label">${window.siyuan.languages.dataHistory}</span>
</div>
<div class="b3-menu__separator${(isInAndroid() || isInIOS()) ? "" : " fn__none"}"></div>
<div class="b3-menu__item${(isInAndroid() || isInIOS()) ? "" : " fn__none"}" id="menuSafeQuit">
<div class="b3-menu__item b3-menu__item--warning${(isInAndroid() || isInIOS()) ? "" : " fn__none"}" id="menuSafeQuit">
<svg class="b3-menu__icon"><use xlink:href="#iconQuit"></use></svg><span class="b3-menu__label">${window.siyuan.languages.safeQuit}</span>
</div>
<div class="b3-menu__separator"></div>

1
app/src/types/index.d.ts vendored
View file

@ -713,6 +713,7 @@ interface IMenu {
index?: number
element?: HTMLElement
ignore?: boolean
warning?: boolean
}
interface IBazaarItem {