From 04c306b3603eea9639763a2da5103619b0d5ed17 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 17 Jul 2023 22:26:41 +0200 Subject: [PATCH] support combination of shared and cloned in the note tree, fixes #4097 --- src/public/app/widgets/note_tree.js | 3 ++- src/public/stylesheets/tree.css | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 3db180b76..750ff46fc 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -742,7 +742,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget { if (note.isShared()) { extraClasses.push("shared"); } - else if (note.getParentNoteIds().length > 1) { + + if (note.getParentNoteIds().length > 1) { const realClones = note.getParentNoteIds() .map(noteId => froca.notes[noteId]) .filter(note => !!note) diff --git a/src/public/stylesheets/tree.css b/src/public/stylesheets/tree.css index fc7183054..70c99c3d7 100644 --- a/src/public/stylesheets/tree.css +++ b/src/public/stylesheets/tree.css @@ -132,8 +132,16 @@ span.fancytree-node.protected > span.fancytree-custom-icon { 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 { - content: " *"; + font-family: 'boxicons' !important; + font-size: smaller; + content: " \ec27"; /* lookup code for "star" in boxicons.css */ } span.fancytree-node.shared .fancytree-title::after {