diff --git a/libraries/ckeditor/ckeditor-content.css b/libraries/ckeditor/ckeditor-content.css index dcee29f78..abfceaf89 100644 --- a/libraries/ckeditor/ckeditor-content.css +++ b/libraries/ckeditor/ckeditor-content.css @@ -1,6 +1,6 @@ /* !!!!!! TRILIUM CUSTOM CHANGES !!!!!! */ -.ck-widget__selection-handle, .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */ +.printed-content .ck-widget__selection-handle, .printed-content .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */ display: none; } diff --git a/src/public/app/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js index 95cbb9c1e..48c2d6905 100644 --- a/src/public/app/services/tree_context_menu.js +++ b/src/public/app/services/tree_context_menu.js @@ -94,7 +94,7 @@ class TreeContextMenu { enabled: !clipboard.isClipboardEmpty() && notSearch && noSelectedNotes }, { title: 'Paste after', command: "pasteNotesAfterFromClipboard", uiIcon: "paste", enabled: !clipboard.isClipboardEmpty() && isNotRoot && !isHoisted && parentNotSearch && noSelectedNotes }, - { title: "Duplicate subtree(s) here", command: "duplicateSubtree", uiIcon: "empty", + { title: `Duplicate subtree `, command: "duplicateSubtree", uiIcon: "empty", enabled: parentNotSearch && isNotRoot && !isHoisted }, { title: "----" }, { title: "Export", command: "exportNote", uiIcon: "empty", diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js index 98a818cd4..4fa5de88e 100644 --- a/src/public/app/widgets/note_detail.js +++ b/src/public/app/widgets/note_detail.js @@ -248,7 +248,7 @@ export default class NoteDetailWidget extends TabAwareWidget { this.$widget.find('.note-detail-printable:visible').printThis({ header: $("

").text(this.note && this.note.title).prop('outerHTML'), - footer: "", + footer: "", importCSS: false, loadCSS: [ "libraries/codemirror/codemirror.css", diff --git a/src/public/stylesheets/themes.css b/src/public/stylesheets/themes.css index fb2702966..c11092fcc 100644 --- a/src/public/stylesheets/themes.css +++ b/src/public/stylesheets/themes.css @@ -143,6 +143,11 @@ body { --ck-color-dropdown-panel-background: var(--accented-background-color); --ck-color-dropdown-panel-border: var(--main-border-color); + /* -- Overrides the default .ck-splitbutton class colors. ----------------------------------- */ + + --ck-color-split-button-hover-background: var(--ck-color-button-default-hover-background); + --ck-color-split-button-hover-border: var(--main-border-color); + /* -- Overrides the default .ck-input class colors. ----------------------------------------- */ --ck-color-input-background: var(--accented-background-color); @@ -199,6 +204,9 @@ body { --ck-color-engine-placeholder-text: var(--muted-text-color); --ck-z-modal: 10000; + + --ck-color-widget-type-around-button: var(--main-border-color); + --ck-color-widget-type-around-button-hover: var(--main-border-color); } body { diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js index c32881815..2bac4be6f 100644 --- a/src/services/keyboard_actions.js +++ b/src/services/keyboard_actions.js @@ -184,6 +184,12 @@ const DEFAULT_KEYBOARD_ACTIONS = [ description: "Add note above to the selection", scope: "note-tree" }, + { + actionName: "duplicateSubtree", + defaultShortcuts: [], + description: "Duplicate subtree", + scope: "note-tree" + }, { diff --git a/src/services/notes.js b/src/services/notes.js index 3f4eddf56..4aa944504 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -739,7 +739,10 @@ function duplicateSubtree(origNoteId, newParentNoteId) { const res = duplicateSubtreeInner(origNote, origBranch, newParentNoteId, noteIdMapping); - res.note.title += " (dup)"; + if (!res.note.title.endsWith('(dup)')) { + res.note.title += " (dup)"; + } + res.note.save(); return res;