Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop

This commit is contained in:
Elian Doran 2025-05-27 22:00:53 +03:00
commit 41b3441e42
No known key found for this signature in database

View File

@ -396,12 +396,12 @@
*/ */
.attachment-content-wrapper pre, .attachment-content-wrapper pre,
.ck-content pre, :root .ck-content pre,
.ck-mermaid__editing-view { .ck-mermaid__editing-view {
border: 0; border: 0;
border-radius: 6px; border-radius: 6px;
box-shadow: var(--code-block-box-shadow); box-shadow: var(--code-block-box-shadow);
padding: 0 !important; padding: 0;
margin-top: 2px !important; margin-top: 2px !important;
} }
@ -426,7 +426,7 @@ pre button.copy-button.icon-action {
} }
:root pre:has(> button.copy-button) { :root pre:has(> button.copy-button) {
padding-right: calc(var(--icon-button-size) + (var(--copy-button-margin-size) * 2)) !important; padding-right: calc(var(--icon-button-size) + (var(--copy-button-margin-size) * 2));
} }
html .note-detail-editable-text :not(figure, .include-note, hr):first-child { html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
@ -444,10 +444,10 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
} }
.attachment-content-wrapper pre code, .attachment-content-wrapper pre code,
.ck-content pre code, :root .ck-content pre code,
.ck-mermaid__editing-view { .ck-mermaid__editing-view {
display: block; display: block;
padding: var(--padding-size, 1em) !important; padding: var(--padding-size, 1em);
overflow: auto; overflow: auto;
} }