Skip to content

Build your personal knowledge base with Trilium Notes

fix(text): keep CKEditor 48's content look under CKEditor 49

Elian Doran3846135db33e
diff --git a/apps/client/src/stylesheets/ckeditor-theme.css b/apps/client/src/stylesheets/ckeditor-theme.css
index b5d674375b..2e71bf1eae 100644
--- a/apps/client/src/stylesheets/ckeditor-theme.css
+++ b/apps/client/src/stylesheets/ckeditor-theme.css
@@ -194,3 +194,15 @@ div.ck.ck-balloon-panel.ck-dropdown-menu__nested-menu__panel {
div.ck.ck-balloon-panel.ck-dropdown-menu__nested-menu__panel {
overflow-x: clip;
}
+
+:root .ck.ck-editor__editable_inline {
+ --ck-editor-editable-padding: 0 .6em;
+
+ & > :first-child {
+ margin-top: .9em;
+ }
+
+ & > :last-child {
+ margin-bottom: .9em;
+ }
+}
diff --git a/apps/desktop/scripts/build.ts b/apps/desktop/scripts/build.ts
index 5b9ad9b0f0..ffc2202a7a 100644
--- a/apps/desktop/scripts/build.ts
+++ b/apps/desktop/scripts/build.ts
@@ -40,6 +40,7 @@ async function main() {
build.trimBetterSqlite3({ includeMusl: false });
build.copy("/node_modules/ckeditor5/dist/ckeditor5-content.css", "ckeditor5-content.css");
+ build.copy("/packages/ckeditor5/src/theme/content_colors.css", "ckeditor5-content-colors.css");
build.copy("/packages/ckeditor5/src/theme/multicolumn.css", "ckeditor5-multicolumn.css");
build.buildFrontend();
diff --git a/apps/edit-docs/scripts/build.ts b/apps/edit-docs/scripts/build.ts
index 1debb77747..574f88c056 100644
--- a/apps/edit-docs/scripts/build.ts
+++ b/apps/edit-docs/scripts/build.ts
@@ -13,6 +13,7 @@ async function main() {
build.copy("/apps/server/src/assets", "assets/");
build.copy("/packages/share-theme/src/templates", "share-theme/templates/");
build.copy("/node_modules/ckeditor5/dist/ckeditor5-content.css", "ckeditor5-content.css");
+ build.copy("/packages/ckeditor5/src/theme/content_colors.css", "ckeditor5-content-colors.css");
build.copy("/packages/ckeditor5/src/theme/multicolumn.css", "ckeditor5-multicolumn.css");
build.buildFrontend();
diff --git a/apps/edit-docs/spec/build-checks/artifacts.spec.ts b/apps/edit-docs/spec/build-checks/artifacts.spec.ts
index e01c12141d..e1550e517b 100644
--- a/apps/edit-docs/spec/build-checks/artifacts.spec.ts
+++ b/apps/edit-docs/spec/build-checks/artifacts.spec.ts
@@ -33,6 +33,7 @@ describe("Check artifacts are present", () => {
"assets",
"share-theme",
"ckeditor5-content.css",
+ "ckeditor5-content-colors.css",
"ckeditor5-multicolumn.css"
];
diff --git a/apps/server/scripts/build.ts b/apps/server/scripts/build.ts
index 04b1c601a0..107b57452e 100644
--- a/apps/server/scripts/build.ts
+++ b/apps/server/scripts/build.ts
@@ -36,6 +36,7 @@ async function main() {
build.copyNodeModules([ "better-sqlite3" ]);
build.trimBetterSqlite3();
build.copy("/node_modules/ckeditor5/dist/ckeditor5-content.css", "ckeditor5-content.css");
+ build.copy("/packages/ckeditor5/src/theme/content_colors.css", "ckeditor5-content-colors.css");
build.copy("/packages/ckeditor5/src/theme/multicolumn.css", "ckeditor5-multicolumn.css");
build.buildFrontend();
diff --git a/apps/server/src/services/export/zip/factory.spec.ts b/apps/server/src/services/export/zip/factory.spec.ts
index b9a6fcdf6a..d8286d6a67 100644
--- a/apps/server/src/services/export/zip/factory.spec.ts
+++ b/apps/server/src/services/export/zip/factory.spec.ts
@@ -42,7 +42,9 @@ let readFileSyncSpy: ReturnType<typeof vi.spyOn>;
beforeEach(() => {
readFileSyncSpy = vi.spyOn(fs, "readFileSync").mockImplementation(((file: string) =>
- (String(file).endsWith("multicolumn.css") ? ".columns {}" : "body { color: red; }")
+ (String(file).endsWith("multicolumn.css") ? ".columns {}"
+ : /content[_-]colors\.css$/.test(String(file)) ? ".colors {}"
+ : "body { color: red; }")
) as any);
});
@@ -57,12 +59,12 @@ describe("serverZipExportProviderFactory", () => {
const provider = await factory("html", data);
expect(provider).toBeInstanceOf(FakeHtml);
- expect((provider as any).opts.contentCss).toBe("body { color: red; }\n.columns {}");
+ expect((provider as any).opts.contentCss).toBe("body { color: red; }\n.colors {}\n.columns {}");
// production reads the bundled css next to the resource dir
const readPaths = readFileSyncSpy.mock.calls.map(([ file ]) => String(file));
- expect(readPaths).toHaveLength(2);
- expect(path.basename(readPaths[0])).toBe("ckeditor5-content.css");
- expect(path.basename(readPaths[1])).toBe("ckeditor5-multicolumn.css");
+ expect(readPaths.map((file) => path.basename(file))).toEqual([
+ "ckeditor5-content.css", "ckeditor5-content-colors.css", "ckeditor5-multicolumn.css"
+ ]);
expect(readPaths.some((file) => file.includes("node_modules"))).toBe(false);
});
@@ -71,16 +73,18 @@ describe("serverZipExportProviderFactory", () => {
const provider = await factory("html", data);
const readPaths = readFileSyncSpy.mock.calls.map(([ file ]) => String(file));
- expect(readPaths).toHaveLength(2);
+ expect(readPaths).toHaveLength(3);
expect(readPaths[0]).toContain("ckeditor5-content.css");
// dev resolves the file from the ckeditor5 package (under node_modules),
// unlike the production path which reads from the resource dir.
expect(readPaths[0]).toContain("node_modules");
- // The multicolumn stylesheet comes from the workspace's own editor package.
- expect(path.normalize(readPaths[1]))
- .toContain(path.join("packages", "ckeditor5", "src", "theme", "multicolumn.css"));
+ // The content colors and the multicolumn stylesheet come from the workspace's own editor package.
+ const theme = path.join("packages", "ckeditor5", "src", "theme");
+ expect(path.normalize(readPaths[1])).toContain(path.join(theme, "content_colors.css"));
+ expect(path.normalize(readPaths[2])).toContain(path.join(theme, "multicolumn.css"));
expect(fs.existsSync(readPaths[1])).toBe(true);
- expect((provider as any).opts.contentCss).toBe("body { color: red; }\n.columns {}");
+ expect(fs.existsSync(readPaths[2])).toBe(true);
+ expect((provider as any).opts.contentCss).toBe("body { color: red; }\n.colors {}\n.columns {}");
});
it("builds a Markdown provider without reading any CSS", async () => {
diff --git a/apps/server/src/services/export/zip/factory.ts b/apps/server/src/services/export/zip/factory.ts
index 8fd347ee44..1ef6308e1a 100644
--- a/apps/server/src/services/export/zip/factory.ts
+++ b/apps/server/src/services/export/zip/factory.ts
@@ -4,15 +4,19 @@ import path from "path";
import { getResourceDir, isDev } from "../../utils.js";
-/** The stylesheet of an HTML export: CKEditor's content styles, then the multicolumn layout's. */
+/**
+ * The stylesheet of an HTML export: CKEditor's content styles, Trilium's content colors over them,
+ * then the multicolumn layout's.
+ */
function readContentCss(): string {
const cssFiles = isDev
? [
require.resolve("ckeditor5/ckeditor5-content.css"),
// In development the resource directory is `apps/server/src`.
+ path.join(getResourceDir(), "../../../packages/ckeditor5/src/theme/content_colors.css"),
path.join(getResourceDir(), "../../../packages/ckeditor5/src/theme/multicolumn.css")
]
- : [ "ckeditor5-content.css", "ckeditor5-multicolumn.css" ]
+ : [ "ckeditor5-content.css", "ckeditor5-content-colors.css", "ckeditor5-multicolumn.css" ]
.map((fileName) => path.join(getResourceDir(), fileName));
return cssFiles.map((cssFile) => fs.readFileSync(cssFile, "utf-8")).join("\n");
}
diff --git a/packages/ckeditor5/src/index.ts b/packages/ckeditor5/src/index.ts
index 2894f22c75..4beeccbf03 100644
--- a/packages/ckeditor5/src/index.ts
+++ b/packages/ckeditor5/src/index.ts
@@ -3,6 +3,7 @@ import "ckeditor5/ckeditor5.css";
// admonition plugin (which was forked from block-quote) but styles `blockquote`, not admonitions —
// the client's theme-next stylesheet overrides parts of it with `!important`.
import "./theme/blockquote.css";
+import "./theme/content_colors.css";
import "./theme/code_block_toolbar.css";
import "./theme/link_embed_form.css";
import type { ClipboardImageEmbedConfig } from "./plugins/clipboard_image_embed.js";
diff --git a/packages/ckeditor5/src/theme/ck-content.css b/packages/ckeditor5/src/theme/ck-content.css
index c958b9076b..52145065eb 100644
--- a/packages/ckeditor5/src/theme/ck-content.css
+++ b/packages/ckeditor5/src/theme/ck-content.css
@@ -1,4 +1,5 @@
@import "ckeditor5/ckeditor5-content.css";
+@import "./content_colors.css";
@import "./admonitions.css";
.printed-content .ck-widget__selection-handle, .printed-content .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */
diff --git a/packages/ckeditor5/src/theme/content_colors.css b/packages/ckeditor5/src/theme/content_colors.css
new file mode 100644
index 0000000000..aed646383a
--- /dev/null
+++ b/packages/ckeditor5/src/theme/content_colors.css
@@ -0,0 +1,21 @@
+/*
+ * CKEditor 48's content colors, which CKEditor 49 replaced with lighter, opaque ones that do not
+ * suit a dark theme. Imported after CKEditor's stylesheet, whose selectors these match.
+ */
+
+.ck-content blockquote {
+ border-left-color: hsl(0, 0%, 80%);
+}
+
+.ck-content[dir="rtl"] blockquote {
+ border-right-color: hsl(0, 0%, 80%);
+}
+
+.ck-content pre {
+ border-color: hsl(0, 0%, 77%);
+ background: hsla(0, 0%, 78%, .3);
+}
+
+.ck-content hr {
+ background: hsl(0, 0%, 87%);
+}