gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

support combination of shared and cloned in the note tree, fixes #4097

Browse Source
This commit is contained in:
zadam 2023-07-17 22:26:41 +02:00
parent d6a4f1db13
commit 04c306b360
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/widgets/note_tree.js
View File

@ -742,7 +742,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
if (note.isShared()) { if (note.isShared()) {
extraClasses.push("shared"); extraClasses.push("shared");
} }
else if (note.getParentNoteIds().length > 1) {
if (note.getParentNoteIds().length > 1) {
const realClones = note.getParentNoteIds() const realClones = note.getParentNoteIds()
.map(noteId => froca.notes[noteId]) .map(noteId => froca.notes[noteId])
.filter(note => !!note) .filter(note => !!note)

10
src/public/stylesheets/tree.css
View File

@ -132,8 +132,16 @@ span.fancytree-node.protected > span.fancytree-custom-icon {
filter: drop-shadow(2px 2px 2px var(--main-text-color)); filter: drop-shadow(2px 2px 2px var(--main-text-color));
} }
span.fancytree-node.multiple-parents.shared .fancytree-title::after {
font-family: 'boxicons' !important;
font-size: smaller;
content: " \ec27 \ec03";
}
span.fancytree-node.multiple-parents .fancytree-title::after { span.fancytree-node.multiple-parents .fancytree-title::after {
content: " *"; font-family: 'boxicons' !important;
font-size: smaller;
content: " \ec27"; /* lookup code for "star" in boxicons.css */
} }
span.fancytree-node.shared .fancytree-title::after { span.fancytree-node.shared .fancytree-title::after {