gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/theme/improvements

Browse Source
This commit is contained in:
Adorian Doran 2025-08-30 01:06:02 +03:00
commit 526c5a6dd8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/client/src/stylesheets/style.css
View File

@ -982,6 +982,11 @@ div[data-notify="container"] {
font-family: var(--monospace-font-family); font-family: var(--monospace-font-family);
} }
svg.ck-icon .note-icon {
color: var(--main-text-color);
font-size: 20px;
}
.ck-content { .ck-content {
--ck-content-font-family: var(--detail-font-family); --ck-content-font-family: var(--detail-font-family);
--ck-content-font-size: 1.1em; --ck-content-font-size: 1.1em;

12
apps/client/src/widgets/type_widgets/ckeditor/snippets.ts
View File

@ -4,7 +4,6 @@ import type LoadResults from "../../../services/load_results.js";
import search from "../../../services/search.js"; import search from "../../../services/search.js";
import type { TemplateDefinition } from "@triliumnext/ckeditor5"; import type { TemplateDefinition } from "@triliumnext/ckeditor5";
import appContext from "../../../components/app_context.js"; import appContext from "../../../components/app_context.js";
import TemplateIcon from "@ckeditor/ckeditor5-icons/theme/icons/template.svg?raw";
import type FNote from "../../../entities/fnote.js"; import type FNote from "../../../entities/fnote.js";
interface TemplateData { interface TemplateData {
@ -31,7 +30,7 @@ export default async function getTemplates() {
definitions.push({ definitions.push({
title: snippet.title, title: snippet.title,
data: () => templateCache.get(snippet.noteId)?.content ?? "", data: () => templateCache.get(snippet.noteId)?.content ?? "",
icon: TemplateIcon, icon: buildIcon(snippet),
description description
}); });
} }
@ -49,6 +48,15 @@ async function invalidateCacheFor(snippet: FNote) {
return data; return data;
} }
function buildIcon(snippet: FNote) {
return /*xml*/`\
<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<foreignObject x="0" y="0" width="20" height="20">
<span class="note-icon ${snippet.getIcon()} ${snippet.getColorClass()}" xmlns="http://www.w3.org/1999/xhtml"></span>
</foreignObject>
</svg>`
}
function handleFullReload() { function handleFullReload() {
console.warn("Full text editor reload needed"); console.warn("Full text editor reload needed");
appContext.triggerCommand("reloadTextEditor"); appContext.triggerCommand("reloadTextEditor");