From 0d9cdcac852632123a3a76f95b53bcb6708e28c7 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Mar 2020 22:01:34 +0100 Subject: [PATCH 1/3] load appropriate styles for printing book notes, closes #899 --- package-lock.json | 2 +- src/public/javascripts/desktop.js | 5 ++- src/public/stylesheets/detail.css | 61 ++++++++++++++++++++++++++++++ src/public/stylesheets/style.css | 62 ------------------------------- src/views/desktop.ejs | 1 + src/views/mobile.ejs | 1 + 6 files changed, 68 insertions(+), 64 deletions(-) create mode 100644 src/public/stylesheets/detail.css diff --git a/package-lock.json b/package-lock.json index 6eec5f662..86e578afb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.40.3", + "version": "0.40.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index c240275b0..1720ef33c 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -161,7 +161,10 @@ async function printActiveNote() { importCSS: false, loadCSS: [ "libraries/codemirror/codemirror.css", - "libraries/ckeditor/ckeditor-content.css" + "libraries/ckeditor/ckeditor-content.css", + "libraries/ckeditor/ckeditor-content.css", + "libraries/bootstrap/css/bootstrap.min.css", + "stylesheets/detail.css" ], debug: true }); diff --git a/src/public/stylesheets/detail.css b/src/public/stylesheets/detail.css new file mode 100644 index 000000000..c441c231c --- /dev/null +++ b/src/public/stylesheets/detail.css @@ -0,0 +1,61 @@ +.note-detail-book { + height: 100%; +} + +.note-detail-book-content { + display: flex; + flex-wrap: wrap; + overflow: auto; + height: 100%; + align-content: start; +} + +.note-book-card { + border-radius: 10px; + background-color: var(--accented-background-color); + padding: 15px; + padding-bottom: 5px; + margin: 5px; + margin-left: 0; + overflow: hidden; + display: flex; + flex-direction: column; + flex-shrink: 0; +} + +.note-book-card .note-book-card { + border: 1px solid var(--main-border-color); +} + +.note-book-content { + overflow: hidden; +} + +.note-book-card.type-image .note-book-content, .note-book-card.type-file .note-book-content, .note-book-card.type-protected-session .note-book-content { + display: flex; + align-items: center; + justify-content: center; + text-align: center; +} + +.note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img { + max-width: 100%; + max-height: 100%; +} + +.note-book-title { + flex-grow: 0; +} + +.note-book-content { + flex-grow: 1; +} + +.note-book-auto-message { + background-color: var(--accented-background-color); + text-align: center; + width: 100%; + border-radius: 10px; + padding: 5px; + margin-top: 5px; +} \ No newline at end of file diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 10acf89d6..51c44c1b9 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -857,68 +857,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href z-index: 100; } -.note-detail-book { - height: 100%; -} - -.note-detail-book-content { - display: flex; - flex-wrap: wrap; - overflow: auto; - height: 100%; - align-content: start; -} - -.note-book-card { - border-radius: 10px; - background-color: var(--accented-background-color); - padding: 15px; - padding-bottom: 5px; - margin: 5px; - margin-left: 0; - overflow: hidden; - display: flex; - flex-direction: column; - flex-shrink: 0; -} - -.note-book-card .note-book-card { - border: 1px solid var(--main-border-color); -} - -.note-book-content { - overflow: hidden; -} - -.note-book-card.type-image .note-book-content, .note-book-card.type-file .note-book-content, .note-book-card.type-protected-session .note-book-content { - display: flex; - align-items: center; - justify-content: center; - text-align: center; -} - -.note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img { - max-width: 100%; - max-height: 100%; -} - -.note-book-title { - flex-grow: 0; -} - -.note-book-content { - flex-grow: 1; -} - -.note-book-auto-message { - background-color: var(--accented-background-color); - text-align: center; - width: 100%; - border-radius: 10px; - padding: 5px; - margin-top: 5px; -} - #toast-container { position: absolute; width: 100%; diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 595088d85..0c3ffafe0 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -250,6 +250,7 @@ + diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs index fa43557da..acfdaf7cd 100644 --- a/src/views/mobile.ejs +++ b/src/views/mobile.ejs @@ -118,6 +118,7 @@ + From 3d3ad3b99b53d99cbfbd2188234b373cd15b58e1 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Mar 2020 22:14:07 +0100 Subject: [PATCH 2/3] include themes.css for printing to have default CSS variables available --- src/public/javascripts/desktop.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 1720ef33c..97402f3c3 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -164,6 +164,7 @@ async function printActiveNote() { "libraries/ckeditor/ckeditor-content.css", "libraries/ckeditor/ckeditor-content.css", "libraries/bootstrap/css/bootstrap.min.css", + "stylesheets/themes.css", "stylesheets/detail.css" ], debug: true From 78a50be66334f532626fa0798f8a7ec57101afa4 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Mar 2020 22:18:12 +0100 Subject: [PATCH 3/3] don't print control buttons --- src/public/javascripts/desktop.js | 1 + src/public/javascripts/services/note_detail_book.js | 4 ++-- src/public/stylesheets/print.css | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/public/stylesheets/print.css diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 97402f3c3..439ba1fcb 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -164,6 +164,7 @@ async function printActiveNote() { "libraries/ckeditor/ckeditor-content.css", "libraries/ckeditor/ckeditor-content.css", "libraries/bootstrap/css/bootstrap.min.css", + "stylesheets/print.css", "stylesheets/themes.css", "stylesheets/detail.css" ], diff --git a/src/public/javascripts/services/note_detail_book.js b/src/public/javascripts/services/note_detail_book.js index 2a6d9bea8..4eeef06f0 100644 --- a/src/public/javascripts/services/note_detail_book.js +++ b/src/public/javascripts/services/note_detail_book.js @@ -148,8 +148,8 @@ class NoteDetailBook { const label = `${childCount} child${childCount > 1 ? 'ren' : ''}`; $card.append($('
') - .append($(`+ Show ${label}`)) - .append($(`- Hide ${label}`).hide()) + .append($(`+ Show ${label}`)) + .append($(`- Hide ${label}`).hide()) .append($('
')) ); } diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css new file mode 100644 index 000000000..6abc23c8d --- /dev/null +++ b/src/public/stylesheets/print.css @@ -0,0 +1,7 @@ +@media print +{ + .no-print, .no-print * + { + display: none !important; + } +} \ No newline at end of file