diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css
index 7fce22b35..1dd2330df 100644
--- a/app/appearance/themes/daylight/theme.css
+++ b/app/appearance/themes/daylight/theme.css
@@ -185,6 +185,9 @@
--b3-pdf-dark: #212224;
/* callout */
+ --b3-callout-note: var(--b3-theme-primary);
+ --b3-callout-tip: var(--b3-theme-success);
+ --b3-callout-caution: var(--b3-theme-error);
--b3-callout-important: var(--b3-protyle-inline-blockref-color);
--b3-callout-warning: var(--b3-protyle-inline-mark-background);
diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css
index 08520fcfa..557e7dc51 100644
--- a/app/appearance/themes/midnight/theme.css
+++ b/app/appearance/themes/midnight/theme.css
@@ -184,6 +184,9 @@
--b3-pdf-dark: #212224;
/* callout */
+ --b3-callout-note: var(--b3-theme-primary);
+ --b3-callout-tip: var(--b3-theme-success);
+ --b3-callout-caution: var(--b3-theme-error);
--b3-callout-important: var(--b3-protyle-inline-blockref-color);
--b3-callout-warning: var(--b3-protyle-inline-mark-background);
diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss
index d44b0153f..e045b1974 100644
--- a/app/src/assets/scss/component/_typography.scss
+++ b/app/src/assets/scss/component/_typography.scss
@@ -163,11 +163,11 @@
// NOTE
&::before {
- background-color: var(--b3-theme-primary);
+ background-color: var(--b3-callout-note);
}
.callout-info {
- color: var(--b3-theme-primary);
+ color: var(--b3-callout-note);
}
&[data-subtype="WARNING"] {
@@ -182,11 +182,11 @@
&[data-subtype="TIP"] {
&::before {
- background-color: var(--b3-theme-success);
+ background-color: var(--b3-callout-tip);
}
.callout-info {
- color: var(--b3-theme-success);
+ color: var(--b3-callout-tip);
}
}
@@ -202,11 +202,11 @@
&[data-subtype="CAUTION"] {
&::before {
- background-color: var(--b3-theme-error);
+ background-color: var(--b3-callout-caution);
}
.callout-info {
- color: var(--b3-theme-error);
+ color: var(--b3-callout-caution);
}
}
diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts
index 4292b8d60..7e1d9bb64 100644
--- a/app/src/mobile/util/keyboardToolbar.ts
+++ b/app/src/mobile/util/keyboardToolbar.ts
@@ -250,11 +250,11 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => {
${getSlashItem("1. " + Lute.Caret, "iconOrderedList", window.siyuan.languages["ordered-list"], "true")}
${getSlashItem("- [ ] " + Lute.Caret, "iconCheck", window.siyuan.languages.check, "true")}
${getSlashItem("> " + Lute.Caret, "iconQuote", window.siyuan.languages.quote, "true")}
- ${getSlashItem(`> [!NOTE]\n> ${Lute.Caret}`, 'โ๏ธ', `${window.siyuan.languages.callout} - Note`, "true")}
- ${getSlashItem(`> [!TIP]\n> ${Lute.Caret}`, '๐ก', `${window.siyuan.languages.callout} - Tip`, "true")}
+ ${getSlashItem(`> [!NOTE]\n> ${Lute.Caret}`, 'โ๏ธ', `${window.siyuan.languages.callout} - Note`, "true")}
+ ${getSlashItem(`> [!TIP]\n> ${Lute.Caret}`, '๐ก', `${window.siyuan.languages.callout} - Tip`, "true")}
${getSlashItem(`> [!IMPORTANT]\n> ${Lute.Caret}`, 'โ', `${window.siyuan.languages.callout} - Important`, "true")}
${getSlashItem(`> [!WARNING]\n> ${Lute.Caret}`, 'โ ๏ธ', `${window.siyuan.languages.callout} - Warning`, "true")}
- ${getSlashItem(`> [!CAUTION]\n> ${Lute.Caret}`, '๐จ', `${window.siyuan.languages.callout} - Caution`, "true")}
+ ${getSlashItem(`> [!CAUTION]\n> ${Lute.Caret}`, '๐จ', `${window.siyuan.languages.callout} - Caution`, "true")}
${getSlashItem("```", "iconCode", window.siyuan.languages.code, "true")}
${getSlashItem(`| ${Lute.Caret} | | |\n| --- | --- | --- |\n| | | |\n| | | |`, "iconTable", window.siyuan.languages.table, "true")}
${getSlashItem("---", "iconLine", window.siyuan.languages.line, "true")}
diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts
index c20dd3cb7..af1044850 100644
--- a/app/src/protyle/hint/extend.ts
+++ b/app/src/protyle/hint/extend.ts
@@ -134,12 +134,12 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
filter: [window.siyuan.languages.callout, "callout", "ts", "ๆ็คบ", "tishi", "note"],
id: "calloutNote",
value: `> [!NOTE]\n> ${Lute.Caret}`,
- html: `โ๏ธ${window.siyuan.languages.callout} - Note
`,
+ html: `โ๏ธ${window.siyuan.languages.callout} - Note
`,
},{
filter: [window.siyuan.languages.callout, "callout", "ts", "ๆ็คบ", "tishi", "tip"],
id: "calloutTip",
value: `> [!TIP]\n> ${Lute.Caret}`,
- html: `๐ก${window.siyuan.languages.callout} - Tip
`,
+ html: `๐ก${window.siyuan.languages.callout} - Tip
`,
},{
filter: [window.siyuan.languages.callout, "callout", "ts", "ๆ็คบ", "tishi", "important"],
id: "calloutImportant",
@@ -154,7 +154,7 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
filter: [window.siyuan.languages.callout, "callout", "ts", "ๆ็คบ", "tishi", "caution"],
id: "calloutCaution",
value: `> [!CAUTION]\n> ${Lute.Caret}`,
- html: `๐จ${window.siyuan.languages.callout} - Caution
`,
+ html: `๐จ${window.siyuan.languages.callout} - Caution
`,
}, {
filter: [window.siyuan.languages.code, "code block", "ไปฃ็ ๅ", "daimakuai", "dmk"],
id: "code",
diff --git a/app/src/protyle/wysiwyg/callout.ts b/app/src/protyle/wysiwyg/callout.ts
index ce171d428..b28e7ef63 100644
--- a/app/src/protyle/wysiwyg/callout.ts
+++ b/app/src/protyle/wysiwyg/callout.ts
@@ -85,15 +85,15 @@ export const updateCalloutType = (titleElement: HTMLElement, protyle: IProtyle)
return;
}
[{
- icon: "โ๏ธ", type: "Note", color: "var(--b3-theme-primary)"
+ icon: "โ๏ธ", type: "Note", color: "var(--b3-callout-note)"
}, {
- icon: "๐ก", type: "Tip", color: "var(--b3-theme-success)"
+ icon: "๐ก", type: "Tip", color: "var(--b3-callout-tip)"
}, {
icon: "โ", type: "Important", color: "var(--b3-callout-important)"
}, {
icon: "โ ๏ธ", type: "Warning", color: "var(--b3-callout-warning)"
}, {
- icon: "๐จ", type: "Caution", color: "var(--b3-theme-error)"
+ icon: "๐จ", type: "Caution", color: "var(--b3-callout-caution)"
}].forEach((item) => {
menu.addItem({
iconHTML: ``,