From 984ecaf99c9d277cf01a06762d79b115b4eb9078 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 23 Nov 2020 20:56:14 +0100 Subject: [PATCH] show again the table handle and type around --- libraries/ckeditor/ckeditor-content.css | 2 +- src/public/app/widgets/note_detail.js | 2 +- src/public/stylesheets/themes.css | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) 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/widgets/note_detail.js b/src/public/app/widgets/note_detail.js index a6cada6c2..3b5752cca 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 {