From 0d2a112839eb6f4869a5aade293abdd0d7983ebe Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 11 Jul 2022 23:05:03 +0200 Subject: [PATCH 1/4] fix build revision in the about dialog, closes #2980 --- src/public/app/widgets/dialogs/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js index cbfeb7046..8ab9482e9 100644 --- a/src/public/app/widgets/dialogs/about.js +++ b/src/public/app/widgets/dialogs/about.js @@ -38,7 +38,7 @@ const TPL = ` Build revision: - + From 52812c27a1c158d4e0f07e6c3f1612d6cf541d6c Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 14 Jul 2022 23:00:35 +0200 Subject: [PATCH 2/4] useMaxWidth for mermaid pie widget, fixes #2984 --- src/public/app/widgets/mermaid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/mermaid.js b/src/public/app/widgets/mermaid.js index 7be42e692..094fe1d3d 100644 --- a/src/public/app/widgets/mermaid.js +++ b/src/public/app/widgets/mermaid.js @@ -61,7 +61,7 @@ export default class MermaidWidget extends NoteContextAwareWidget { gantt: { useMaxWidth: false }, "class": { useMaxWidth: false }, state: { useMaxWidth: false }, - pie: { useMaxWidth: false }, + pie: { useMaxWidth: true }, journey: { useMaxWidth: false }, git: { useMaxWidth: false }, }); From 9114b1befb29a96e61c065a333dfabdf633d1bbc Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 14 Jul 2022 23:39:16 +0200 Subject: [PATCH 3/4] make sure the headings in TOC contain text only, https://github.com/zadam/trilium-web-clipper/issues/42 --- src/public/app/widgets/toc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/toc.js b/src/public/app/widgets/toc.js index f8f7a2352..9d7105f22 100644 --- a/src/public/app/widgets/toc.js +++ b/src/public/app/widgets/toc.js @@ -143,7 +143,9 @@ export default class TocWidget extends CollapsibleWidget { // // Create the list item and set up the click callback // - const $li = $('
  • ' + m[2] + '
  • '); + + const headingText = $("
    ").html(m[2]).text(); + const $li = $('
  • ').text(headingText); // XXX Do this with CSS? How to inject CSS in doRender? $li.hover(function () { $(this).css("font-weight", "bold"); From e6358afb62b9609fcbb63c9763e5d3d39a991028 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 15 Jul 2022 23:35:17 +0200 Subject: [PATCH 4/4] mitigate flickering in note tooltip, #2988 --- src/public/app/services/note_tooltip.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/public/app/services/note_tooltip.js b/src/public/app/services/note_tooltip.js index 77ec358d6..74c4d20ad 100644 --- a/src/public/app/services/note_tooltip.js +++ b/src/public/app/services/note_tooltip.js @@ -59,10 +59,11 @@ async function mouseEnterHandler() { $(this).tooltip({ delay: {"show": 300, "hide": 100}, container: 'body', - placement: 'auto', + // https://github.com/zadam/trilium/issues/2794 https://github.com/zadam/trilium/issues/2988 + // with bottom this flickering happens a bit less + placement: 'bottom', trigger: 'manual', boundary: 'window', - offset: "0, 20", // workaround for https://github.com/zadam/trilium/issues/2794 title: html, html: true, template: '',