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 @@ +