gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2022-07-28 23:48:05 +02:00
commit 6d990de450
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/services/note_tooltip.js
View File

@ -59,10 +59,11 @@ async function mouseEnterHandler() {
$(this).tooltip({ $(this).tooltip({
delay: {"show": 300, "hide": 100}, delay: {"show": 300, "hide": 100},
container: 'body', 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', trigger: 'manual',
boundary: 'window', boundary: 'window',
offset: "0, 20", // workaround for https://github.com/zadam/trilium/issues/2794
title: html, title: html,
html: true, html: true,
template: '<div class="tooltip note-tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>', template: '<div class="tooltip note-tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',

2
src/public/app/widgets/dialogs/about.js
View File

@ -38,7 +38,7 @@ const TPL = `
<tr> <tr>
<th>Build revision:</th> <th>Build revision:</th>
<td><a href="" class="external" target="_blank" class="build-revision"></a></td> <td><a href="" class="build-revision external" target="_blank"></a></td>
</tr> </tr>
<tr> <tr>

2
src/public/app/widgets/mermaid.js
View File

@ -61,7 +61,7 @@ export default class MermaidWidget extends NoteContextAwareWidget {
gantt: { useMaxWidth: false }, gantt: { useMaxWidth: false },
"class": { useMaxWidth: false }, "class": { useMaxWidth: false },
state: { useMaxWidth: false }, state: { useMaxWidth: false },
pie: { useMaxWidth: false }, pie: { useMaxWidth: true },
journey: { useMaxWidth: false }, journey: { useMaxWidth: false },
git: { useMaxWidth: false }, git: { useMaxWidth: false },
}); });

4
src/public/app/widgets/toc.js
View File

@ -152,7 +152,9 @@ export default class TocWidget extends CollapsibleWidget {
// //
// Create the list item and set up the click callback // Create the list item and set up the click callback
// //
const $li = $('<li style="cursor:pointer">' + m[2] + '</li>');
const headingText = $("<div>").html(m[2]).text();
const $li = $('<li style="cursor:pointer">').text(headingText);
// XXX Do this with CSS? How to inject CSS in doRender? // XXX Do this with CSS? How to inject CSS in doRender?
$li.hover(function () { $li.hover(function () {
$(this).css("font-weight", "bold"); $(this).css("font-weight", "bold");