Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Elian Doran 2025-05-27 20:42:29 +03:00
commit c55a3ca898
No known key found for this signature in database
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/stylesheets/theme-next/forms.css
View File

@ -110,7 +110,7 @@ button.btn.btn-success kbd {
:root .icon-action:not(.global-menu-button)::before, :root .icon-action:not(.global-menu-button)::before,
:root .tn-tool-button::before { :root .tn-tool-button::before {
display: block; display: block;
line-height: var(--icon-button-size); line-height: 1;
font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio)); font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
} }

25
apps/client/src/stylesheets/theme-next/notes/text.css
View File

@ -405,10 +405,30 @@
margin-top: 2px !important; margin-top: 2px !important;
} }
.ck-content pre { :root .ck-content pre {
--icon-button-size: 1.8em;
--copy-button-width: var(--icon-button-size);
/* The margin of the copy button is computed so the button will appear vertically centered
* for single-line code blocks */
--copy-button-margin-size: calc((1em * 1.5 + var(--padding-size) * 2 - var(--icon-button-size)) / 2);
/* Where: │ └ Line height
* └───────── Font size
*/
overflow: unset; overflow: unset;
} }
pre button.copy-button.icon-action {
font-size: 1em; /* Workaround: --icon-button-size does not work properly with em units */
}
:root pre:has(> button.copy-button) {
padding-right: calc(var(--icon-button-size) + (var(--copy-button-margin-size) * 2)) !important;
}
html .note-detail-editable-text :not(figure, .include-note, hr):first-child { html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
/* Create some space for the top-side shadow */ /* Create some space for the top-side shadow */
margin-top: 1px !important; margin-top: 1px !important;
@ -427,7 +447,7 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
.ck-content pre code, .ck-content pre code,
.ck-mermaid__editing-view { .ck-mermaid__editing-view {
display: block; display: block;
padding: 1em !important; padding: var(--padding-size, 1em) !important;
overflow: auto; overflow: auto;
} }
@ -499,7 +519,6 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
.note-detail-printable:not(.word-wrap) pre code { .note-detail-printable:not(.word-wrap) pre code {
white-space: pre; white-space: pre;
margin-right: 1em;
} }
.code-sample-wrapper .hljs { .code-sample-wrapper .hljs {