mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
Merge remote-tracking branch 'origin/stable'
This commit is contained in:
commit
6d990de450
@ -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>',
|
||||||
|
@ -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>
|
||||||
|
@ -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 },
|
||||||
});
|
});
|
||||||
|
@ -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");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user