adapt merged changes from master

This commit is contained in:
zadam 2020-02-25 10:47:49 +01:00
parent 36eac6badd
commit fdc99bb6f9
2 changed files with 2 additions and 4 deletions

View File

@ -68,9 +68,7 @@ async function getRenderedContent(note) {
$rendered = $("<em>Content of this note cannot be displayed in the book format</em>");
}
if (note.cssClass) {
$rendered.addClass(note.cssClass);
}
$rendered.addClass(await note.getCssClass());
return {
renderedContent: $rendered,

View File

@ -78,7 +78,7 @@ const TPL = `
text-align: center;
}
.note-book-card.type-image .note-book-content img {
.note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img {
max-width: 100%;
max-height: 100%;
}