1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-09-21 03:39:43 +00:00

Fix unwrapped oveflowed code blocks not showing scroll bars when setting "Wrap long lines in code blocks" to "No" in "Theme tweaks" (#8413)

* Fix unwrapped oveflowed code blocks not showing scroll bars

* Inline code should not follow "Wrap long lines in code blocks" option

* Revert "Inline code should not follow "Wrap long lines in code blocks" option"

This reverts commit 4615a04e59.

* Inline code should not obey "Wrap long lines in code blocks" option

Fix problem described in #8549
This commit is contained in:
Leilei332 2024-08-24 20:57:24 +08:00 committed by GitHub
parent 6d05afebc4
commit 6264aa22d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -157,7 +157,7 @@ code {
color: <<colour code-foreground>>; color: <<colour code-foreground>>;
background-color: <<colour code-background>>; background-color: <<colour code-background>>;
border: 1px solid <<colour code-border>>; border: 1px solid <<colour code-border>>;
white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}}; white-space: pre-wrap;
padding: 0 3px 2px; padding: 0 3px 2px;
border-radius: 3px; border-radius: 3px;
font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}}; font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}};
@ -293,10 +293,13 @@ form.tc-form-inline {
Markdown likes putting code elements inside pre elements Markdown likes putting code elements inside pre elements
*/ */
pre > code { pre > code {
padding: 0; display: block;
padding: 0.5em;
border: none; border: none;
white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
background-color: inherit; background-color: inherit;
color: inherit; color: inherit;
overflow-x: auto;
} }
/* /*