mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-03-14 00:16:13 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
3289aecb7a
17 changed files with 63 additions and 61 deletions
|
|
@ -958,6 +958,8 @@ app.whenReady().then(() => {
|
|||
new Notification({
|
||||
title: data.title,
|
||||
body: data.body,
|
||||
icon: path.join(appDir, "stage", "icon.png"),
|
||||
timeoutType: "never",
|
||||
}).show();
|
||||
break;
|
||||
case "setSpellCheckerLanguages":
|
||||
|
|
|
|||
|
|
@ -246,11 +246,11 @@ export const bazaar = {
|
|||
let themeMode = "";
|
||||
if (bazaarType === "themes") {
|
||||
const themeValue = (bazaar.element.querySelector("#bazaarSelect") as HTMLSelectElement).value;
|
||||
if ((themeValue === "0" && item.modes.includes("dark")) ||
|
||||
themeValue === "1" && item.modes.includes("light")) {
|
||||
if ((themeValue === "0" && item.modes?.includes("dark")) ||
|
||||
themeValue === "1" && item.modes?.includes("light")) {
|
||||
hide = true;
|
||||
}
|
||||
themeMode = item.modes.toString();
|
||||
themeMode = item.modes?.toString() || "";
|
||||
}
|
||||
let showSwitch = false;
|
||||
if (["icons", "themes"].includes(bazaarType)) {
|
||||
|
|
|
|||
4
app/stage/protyle/js/lute/lute.min.js
vendored
4
app/stage/protyle/js/lute/lute.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue