diff --git a/package-lock.json b/package-lock.json index ab5efb20b..abd302069 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3063,9 +3063,9 @@ "integrity": "sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==" }, "electron": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.10.tgz", - "integrity": "sha512-eTFm6uTn7NKZE1OtSZSOxNuOrCXXeUR0U3vdF3R00byB7mrNe5AOaXEDDMwtzRGGY1jMuUX9Z7RvgXaCXRYSmw==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.11.tgz", + "integrity": "sha512-mi1oHmeFIQrg+CDQ6lbugZAloOxuWPm/ecEKYe1230PGlDoWND7SYStiWQ2eI4YXAEOL/NvuY88ogemu1qhdBg==", "dev": true, "requires": { "@types/node": "^10.12.18", diff --git a/package.json b/package.json index fc4eddfcd..fa148f97b 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "xml2js": "0.4.22" }, "devDependencies": { - "electron": "6.0.10", + "electron": "6.0.11", "electron-builder": "21.2.0", "electron-compile": "6.4.4", "electron-installer-debian": "2.0.1", diff --git a/src/public/javascripts/services/note_detail_book.js b/src/public/javascripts/services/note_detail_book.js index 23285508a..6af05e004 100644 --- a/src/public/javascripts/services/note_detail_book.js +++ b/src/public/javascripts/services/note_detail_book.js @@ -36,6 +36,18 @@ class NoteDetailBook { return $content; } } + else if (note.type === 'code') { + const fullNote = await server.get('notes/' + note.noteId); + + if (fullNote.content.trim() === "") { + return ""; + } + + return $("
").text(fullNote.content); + } + else if (note.type === 'image') { + return $("").attr("src", `api/images/${note.noteId}/${note.title}`); + } else { return "Content of this note cannot be displayed in the book format"; } diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index ac437f25f..b4a74dbce 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -820,8 +820,9 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href } .note-book { - border-radius: 5px; + border-radius: 10px; background-color: var(--accented-background-color); padding: 15px; - margin-top: 10px; + margin: 10px; + margin-left: 0; } \ No newline at end of file