Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
feat(share): style admonitions like the app
Elian Doran2c9805dbb0d7
diff --git a/apps/client/src/index.ts b/apps/client/src/index.tsindex 989934e32c..b60f866983 100644--- a/apps/client/src/index.ts+++ b/apps/client/src/index.ts@@ -2,6 +2,7 @@// `@import` there would reach the browser unresolved; Vite bundles these into the entry's CSS,// which loads ahead of the stylesheets `loadStylesheets()` appends.import "@triliumnext/ckeditor5/src/theme/adaptive_colors.css";+import "@triliumnext/ckeditor5/src/theme/admonitions.css";import "@triliumnext/ckeditor5/src/theme/external_links.css";import "@triliumnext/ckeditor5/src/theme/footnotes.css";import "@triliumnext/ckeditor5/src/theme/headings.css";diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.cssindex 8e01549380..4946237e01 100644--- a/apps/client/src/stylesheets/style.css+++ b/apps/client/src/stylesheets/style.css@@ -19,11 +19,6 @@}:root {- --admonition-note-accent-color: #69c7ff;- --admonition-tip-accent-color: #40c025;- --admonition-important-accent-color: #9839f7;- --admonition-caution-accent-color: #ff2e2e;- --admonition-warning-accent-color: #e2aa03;--bs-body-font-family: var(--main-font-family) !important;--bs-body-font-weight: var(--main-font-weight) !important;--bs-body-color: var(--main-text-color) !important;@@ -2660,42 +2655,6 @@ footer.webview-footer button {100% { opacity: 0.3; }}-.admonition {- --accent-color: var(--card-border-color);- background: color-mix(in srgb, var(--accent-color) 15%, transparent);- border: 1px solid var(--accent-color);- border-radius: 0.5em;- padding: 1em;- margin: 1.25em 0;- position: relative;- padding-inline-start: 2.5em;- overflow: hidden;-}--.admonition p:last-child {- margin-bottom: 0;-}--.admonition::before {- color: var(--accent-color);- font-family: boxicons !important;- position: absolute;- top: 1em;- inset-inline-start: 1em;-}--.admonition.note { --accent-color: var(--admonition-note-accent-color); }-.admonition.tip { --accent-color: var(--admonition-tip-accent-color); }-.admonition.important { --accent-color: var(--admonition-important-accent-color); }-.admonition.caution { --accent-color: var(--admonition-caution-accent-color); }-.admonition.warning { --accent-color: var(--admonition-warning-accent-color); }--.admonition.note::before { content: "\eb21"; }-.admonition.tip::before { content: "\ea0d"; }-.admonition.important::before { content: "\ea7c"; }-.admonition.caution::before { content: "\eac7"; }-.admonition.warning::before { content: "\eac5"; }-.ck-content ul.todo-list li span.todo-list__label__description {transition: opacity 200ms ease;}diff --git a/apps/standalone/src/lightweight/zip_export_provider_factory.spec.ts b/apps/standalone/src/lightweight/zip_export_provider_factory.spec.tsindex 56bafc28c4..dd37c1b6c4 100644--- a/apps/standalone/src/lightweight/zip_export_provider_factory.spec.ts+++ b/apps/standalone/src/lightweight/zip_export_provider_factory.spec.ts@@ -5,7 +5,8 @@ import BrowserZipProvider from "./zip_provider.js";import { standaloneZipExportProviderFactory } from "./zip_export_provider_factory.js";vi.mock("virtual:share-theme-assets", () => ({ default: [ "styles.css", "scripts.js" ] }));-// Vitest imports a stylesheet with `?raw` as an empty string, so the two stand in with markers.+// Vitest imports a stylesheet with `?raw` as an empty string, so the three stand in with markers.+vi.mock("@triliumnext/ckeditor5/src/theme/admonitions.css?raw", () => ({ default: ".admonition {}" }));vi.mock("@triliumnext/ckeditor5/src/theme/ck-content.css?raw", () => ({ default: ".content {}" }));vi.mock("@triliumnext/ckeditor5/src/theme/multicolumn.css?raw", () => ({ default: ".columns {}" }));@@ -29,14 +30,14 @@ afterEach(() => {});describe("standaloneZipExportProviderFactory", () => {- it("creates an HTML export provider, styled with the content and column styles", async () => {+ it("creates an HTML export provider with content, admonition and column styles", async () => {const data = makeData();const provider = await standaloneZipExportProviderFactory("html", data);expect(provider.constructor.name).toBe("HtmlExportProvider");expect(provider.branch).toBe(data.branch);const { options } = provider as unknown as { options: { contentCss?: string } };- expect(options.contentCss).toBe(".content {}\n.columns {}");+ expect(options.contentCss).toBe(".content {}\n.admonition {}\n.columns {}");});it("creates a Markdown export provider", async () => {diff --git a/apps/standalone/src/lightweight/zip_export_provider_factory.ts b/apps/standalone/src/lightweight/zip_export_provider_factory.tsindex 3c195a5b9b..191f290497 100644--- a/apps/standalone/src/lightweight/zip_export_provider_factory.ts+++ b/apps/standalone/src/lightweight/zip_export_provider_factory.ts@@ -12,6 +12,7 @@ import type {ShareThemeExportAssets} from "@triliumnext/core/src/services/export/zip/share_theme.js";+import admonitionsCss from "@triliumnext/ckeditor5/src/theme/admonitions.css?raw";import contentCss from "@triliumnext/ckeditor5/src/theme/ck-content.css?raw";import multicolumnCss from "@triliumnext/ckeditor5/src/theme/multicolumn.css?raw";@@ -19,7 +20,9 @@ export async function standaloneZipExportProviderFactory(format: ExportFormat, dswitch (format) {case "html": {const { default: HtmlExportProvider } = await import("@triliumnext/core/src/services/export/zip/html.js");- return new HtmlExportProvider(data, { contentCss: `${contentCss}\n${multicolumnCss}` });+ return new HtmlExportProvider(data, {+ contentCss: `${contentCss}\n${admonitionsCss}\n${multicolumnCss}`+ });}case "markdown": {const { default: MarkdownExportProvider } = await import("@triliumnext/core/src/services/export/zip/markdown.js");diff --git a/packages/ckeditor5/src/theme/admonitions.css b/packages/ckeditor5/src/theme/admonitions.cssnew file mode 100644index 0000000000..a8d78ca8a1--- /dev/null+++ b/packages/ckeditor5/src/theme/admonitions.css@@ -0,0 +1,44 @@+/* Admonitions in note content: the app, its print view, the share theme and the HTML export. */+:root {+ --admonition-note-accent-color: #69c7ff;+ --admonition-tip-accent-color: #40c025;+ --admonition-important-accent-color: #9839f7;+ --admonition-caution-accent-color: #ff2e2e;+ --admonition-warning-accent-color: #e2aa03;+}++.admonition {+ --accent-color: var(--card-border-color);+ background: color-mix(in srgb, var(--accent-color) 15%, transparent);+ border: 1px solid var(--accent-color);+ border-radius: 0.5em;+ padding: 1em;+ margin: 1.25em 0;+ position: relative;+ padding-inline-start: 2.5em;+ overflow: hidden;+}++.admonition p:last-child {+ margin-bottom: 0;+}++.admonition::before {+ color: var(--accent-color);+ font-family: boxicons !important;+ position: absolute;+ top: 1em;+ inset-inline-start: 1em;+}++.admonition.note { --accent-color: var(--admonition-note-accent-color); }+.admonition.tip { --accent-color: var(--admonition-tip-accent-color); }+.admonition.important { --accent-color: var(--admonition-important-accent-color); }+.admonition.caution { --accent-color: var(--admonition-caution-accent-color); }+.admonition.warning { --accent-color: var(--admonition-warning-accent-color); }++.admonition.note::before { content: "\eb21"; }+.admonition.tip::before { content: "\ea0d"; }+.admonition.important::before { content: "\ea7c"; }+.admonition.caution::before { content: "\eac7"; }+.admonition.warning::before { content: "\eac5"; }diff --git a/packages/ckeditor5/src/theme/ck-content.css b/packages/ckeditor5/src/theme/ck-content.cssindex 67dfe992e5..c958b9076b 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 "./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 */display: none;@@ -16,44 +17,3 @@.ck-content li p {margin: 0 !important;}--.admonition {- --accent-color: var(--card-border-color);- border: 1px solid var(--accent-color);- box-shadow: var(--card-box-shadow);- background: var(--card-background-color);- border-radius: 0.5em;- padding: 1em;- margin: 1.25em 0;- position: relative;- padding-inline-start: 2.5em;- overflow: hidden;-}--.admonition p:last-child {- margin-bottom: 0;-}--.admonition p, h2 {- margin-top: 0;-}--.admonition.note { --accent-color: #69c7ff; }-.admonition.tip { --accent-color: #40c025; }-.admonition.important { --accent-color: #9839f7; }-.admonition.caution { --accent-color: #ff2e2e; }-.admonition.warning { --accent-color: #e2aa03; }--.admonition::before {- color: var(--accent-color);- font-family: boxicons !important;- position: absolute;- top: 1em;- inset-inline-start: 1em;-}--.admonition.note::before { content: "\eb21"; }-.admonition.tip::before { content: "\ea0d"; }-.admonition.important::before { content: "\ea7c"; }-.admonition.caution::before { content: "\eac7"; }-.admonition.warning::before { content: "\eac5"; }\ No newline at end of file