From 8e73c5906da3e155bedac43375fab1258ca6eb6a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 9 Jun 2025 22:18:44 +0300 Subject: [PATCH] fix(server): missing boxicons in desktop/mobile --- apps/client/src/share.ts | 8 +------- apps/server/src/assets/views/desktop.ejs | 1 + apps/server/src/assets/views/mobile.ejs | 1 + packages/share-theme/src/templates/page.ejs | 3 ++- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/client/src/share.ts b/apps/client/src/share.ts index 824dc22dd..a1e348336 100644 --- a/apps/client/src/share.ts +++ b/apps/client/src/share.ts @@ -1,14 +1,9 @@ import "normalize.css"; +import "boxicons/css/boxicons.min.css"; import "@triliumnext/ckeditor5/content.css"; import "@triliumnext/share-theme/styles/index.css"; import "@triliumnext/share-theme/scripts/index.js"; -async function loadIcons() { - if (document.getElementById("menu")) { - await import("boxicons/css/boxicons.min.css"); - } -} - async function ensureJQuery() { const $ = (await import("jquery")).default; (window as any).$ = $; @@ -53,7 +48,6 @@ document.addEventListener( "DOMContentLoaded", () => { formatCodeBlocks(); - loadIcons(); applyMath(); const toggleMenuButton = document.getElementById("toggleMenuButton"); diff --git a/apps/server/src/assets/views/desktop.ejs b/apps/server/src/assets/views/desktop.ejs index 45356b254..e635e1822 100644 --- a/apps/server/src/assets/views/desktop.ejs +++ b/apps/server/src/assets/views/desktop.ejs @@ -50,6 +50,7 @@ <% } %> + diff --git a/apps/server/src/assets/views/mobile.ejs b/apps/server/src/assets/views/mobile.ejs index 80778d9ad..31c3a3963 100644 --- a/apps/server/src/assets/views/mobile.ejs +++ b/apps/server/src/assets/views/mobile.ejs @@ -128,6 +128,7 @@ <% } %> + diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejs index a55ac7cc7..5c39051eb 100644 --- a/packages/share-theme/src/templates/page.ejs +++ b/packages/share-theme/src/templates/page.ejs @@ -1,6 +1,7 @@ + <% const hasTree = subRoot.note.hasVisibleChildren(); %> @@ -8,6 +9,7 @@ <% if (!isDev && !note.isLabelTruthy("shareOmitDefaultCss")) { %> + <% } %> <% for (const cssRelation of note.getRelations("shareCss")) { %> @@ -64,7 +66,6 @@ const themeClass = currentTheme === "light" ? " theme-light" : " theme-dark"; const headingRe = /()(.+?)(<\/h[1-6]>)/g; const headingMatches = [...content.matchAll(headingRe)]; const slugify = (text) => text.toLowerCase().replace(/[^\w]/g, "-"); -const hasTree = subRoot.note.hasVisibleChildren(); content = content.replaceAll(headingRe, (...match) => { match[0] = match[0].replace(match[3], `#${match[3]}`); return match[0];