Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop

src/public/app/widgets/attribute_widgets/attribute_editor.ts

@@ -15,7 +15,7 @@ import type { CommandData, EventData, EventListener, FilteredCommandNames } from
 import type { default as FAttribute, AttributeType } from "../../entities/fattribute.js";
 import type FNote from "../../entities/fnote.js";
 import { escapeQuotes } from "../../services/utils.js";
-import { buildConfig } from "../type_widgets/ckeditor/toolbars.js";
+import { buildConfig } from "../type_widgets/ckeditor/config.js";
 
 const HELP_TEXT = `
 <p>${t("attribute_editor.help_text_body1")}</p>

src/public/app/widgets/type_widgets/ckeditor/config.ts

@@ -96,11 +96,45 @@ export function buildConfig() {
             defaultProtocol: "https://",
             allowedProtocols: ALLOWED_PROTOCOLS
         },
+        style: {
+            definitions: buildStyleDefinitions()
+        },
         // This value must be kept in sync with the language defined in webpack.config.js.
         language: "en"
     };
 }
 
+function buildStyleDefinitions() {
+    const element = "blockquote";
+    return [
+        {
+            name: "Note",
+            element,
+            classes: [ "admonition", "note" ]
+        },
+        {
+            name: "Tip",
+            element,
+            classes: [ "admonition", "tip" ]
+        },
+        {
+            name: "Important",
+            element,
+            classes: [ "admonition", "important" ]
+        },
+        {
+            name: "Caution",
+            element,
+            classes: [ "admonition", "caution" ]
+        },
+        {
+            name: "Warning",
+            element,
+            classes: [ "admonition", "warning" ]
+        }
+    ];
+}
+
 export function buildToolbarConfig(isClassicToolbar: boolean) {
     if (isClassicToolbar) {
         const multilineToolbar = utils.isDesktop() && options.get("textNoteEditorMultilineToolbar") === "true";
@@ -115,6 +149,7 @@ function buildClassicToolbar(multilineToolbar: boolean) {
     return {
         toolbar: {
             items: [
+                "style",
                 "heading",
                 "fontSize",
                 "|",
@@ -180,6 +215,7 @@ function buildFloatingToolbar() {
         },
 
         blockToolbar: [
+            "style",
             "heading",
             "|",
             "bulletedList",

src/public/app/widgets/type_widgets/editable_text.js

@@ -15,7 +15,7 @@ import options from "../../services/options.js";
 import toast from "../../services/toast.js";
 import { getMermaidConfig } from "../mermaid.js";
 import { normalizeMimeTypeForCKEditor } from "../../services/mime_type_definitions.js";
-import { buildConfig, buildToolbarConfig } from "./ckeditor/toolbars.js";
+import { buildConfig, buildToolbarConfig } from "./ckeditor/config.js";
 
 const ENABLE_INSPECTOR = false;
 

src/public/stylesheets/style.css

@@ -1706,3 +1706,8 @@ footer.file-footer {
 footer.file-footer button {
     margin: 5px;
 }
+
+.ck-content .admonition {
+    box-shadow: var(--card-box-shadow);
+    padding: 1em;
+}