gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix wrapping of code blocks in note revisions, #2216

Browse Source
This commit is contained in:
zadam 2021-10-28 20:38:35 +02:00
parent 7f9019322b
commit 35fc4ba9a4
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -2850,9 +2850,9 @@
} }
}, },
"electron": { "electron": {
"version": "13.6.0", "version": "13.6.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.6.0.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-13.6.1.tgz",
"integrity": "sha512-VDOUmRwa4eQ+5iXE+XHKXKX+2yk8Ey5uBe3nH9Hj6zNPUBY2S0EOClw7U90Ve2lLHXiQ6DnguNmDgOZKJLcHFQ==", "integrity": "sha512-rZ6Y7RberigruefQpWOiI4bA9ppyT88GQF8htY6N1MrAgal5RrBc+Mh92CcGU7zT9QO+XO3DarSgZafNTepffQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -2861,9 +2861,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.17.27", "version": "14.17.32",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
"integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==", "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
"dev": true "dev": true
} }
} }

2
package.json
View File

@ -81,7 +81,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "13.6.0", "electron": "13.6.1",
"electron-builder": "22.13.1", "electron-builder": "22.13.1",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"electron-rebuild": "3.2.3", "electron-rebuild": "3.2.3",

16
src/views/dialogs/note_revisions.ejs
View File

@ -1,5 +1,13 @@
<div id="note-revisions-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog"> <div id="note-revisions-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog">
<style> <style>
#note-revision-content-wrapper {
flex-grow: 1;
margin-left: 20px;
display: flex;
flex-direction: column;
min-width: 0;
}
#note-revision-content { #note-revision-content {
overflow: auto; overflow: auto;
word-break: break-word; word-break: break-word;
@ -9,6 +17,12 @@
max-width: 100%; max-width: 100%;
object-fit: contain; object-fit: contain;
} }
#note-revision-content pre {
max-width: 100%;
word-break: break-all;
white-space: pre-wrap;
}
</style> </style>
<div class="modal-dialog modal-xl" role="document"> <div class="modal-dialog modal-xl" role="document">
@ -34,7 +48,7 @@
<div id="note-revision-list" style="position: static; height: 100%; overflow: auto;" class="dropdown-menu"></div> <div id="note-revision-list" style="position: static; height: 100%; overflow: auto;" class="dropdown-menu"></div>
</div> </div>
<div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px; display: flex; flex-direction: column;"> <div id="note-revision-content-wrapper">
<div style="flex-grow: 0; display: flex; justify-content: space-between;"> <div style="flex-grow: 0; display: flex; justify-content: space-between;">
<h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3> <h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>