IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Multiple codeblocks fixes (#29898)

Browse Source
This commit is contained in:
Jordan Vidrine 2024-11-22 13:52:23 -06:00 committed by GitHub
parent 4b23e6d248
commit 44fbf1048c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/color_definitions.scss
View File

@ -113,6 +113,7 @@
--hljs-attribute: #{$hljs-attribute}; --hljs-attribute: #{$hljs-attribute};
--hljs-addition: #{$hljs-addition}; --hljs-addition: #{$hljs-addition};
--hljs-bg: #{$hljs-bg}; --hljs-bg: #{$hljs-bg};
--inline-code-bg: #{$inline-code-bg};
--hljs-comment: #{$hljs-comment}; --hljs-comment: #{$hljs-comment};
--hljs-deletion: #{$hljs-deletion}; --hljs-deletion: #{$hljs-deletion};
--hljs-keyword: #{$hljs-keyword}; --hljs-keyword: #{$hljs-keyword};

17
app/assets/stylesheets/common/base/code_highlighting.scss
View File

@ -1,12 +1,14 @@
/* originally based on github.com style (c) Vasily Polovnyov <vast@whiteants.net> */
p > code, p > code,
li > code, li > code,
pre > code,
strong > code, strong > code,
em > code { em > code {
font-family: ui-monospace, "Cascadia Mono", "Segoe UI Mono", "Liberation Mono", padding: 2px 4px;
Menlo, Monaco, Consolas, monospace; background: var(--inline-code-bg);
white-space: pre-wrap;
color: var(--primary);
}
code {
color: var(--primary-very-high); color: var(--primary-very-high);
background: var(--hljs-bg); background: var(--hljs-bg);
border-radius: var(--d-button-border-radius); border-radius: var(--d-button-border-radius);
@ -14,11 +16,10 @@ em > code {
line-height: calc((13 + 4) / 13); line-height: calc((13 + 4) / 13);
} }
.hljs { pre > code {
display: block; display: block;
padding: 12px; padding: 12px;
color: var(--primary-very-high); max-height: 500px;
background-color: var(--hljs-bg);
} }
.hljs-comment, .hljs-comment,

9
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -920,15 +920,6 @@ aside.quote {
pre { pre {
max-height: 2000px; max-height: 2000px;
code {
word-wrap: normal;
display: block;
padding: 0.5em;
color: var(--primary);
background: var(--blend-primary-secondary-5);
max-height: 500px;
}
.bidi-warning, .bidi-warning,
.bidi-warning span { .bidi-warning span {
font-style: normal; font-style: normal;

5
app/assets/stylesheets/common/foundation/base.scss
View File

@ -12,9 +12,8 @@
--d-button-border-radius: 2px; --d-button-border-radius: 2px;
--d-input-border-radius: 2px; --d-input-border-radius: 2px;
--d-content-background: initial; --d-content-background: initial;
--d-font-family--monospace: Consolas, Menlo, Monaco, "Lucida Console", --d-font-family--monospace: ui-monospace, "Cascadia Mono", "Segoe UI Mono",
"Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Menlo, Monaco, Consolas, monospace;
"Courier New", monospace;
--d-button-transition: none; --d-button-transition: none;
} }

1
app/assets/stylesheets/common/foundation/color_transformations.scss
View File

@ -166,6 +166,7 @@ $hljs-attr: dark-light-choose(#015692, #88aece) !default;
$hljs-attribute: dark-light-choose(#803378, #c59bc1) !default; $hljs-attribute: dark-light-choose(#803378, #c59bc1) !default;
$hljs-addition: dark-light-choose(#2f6f44, #76c490) !default; $hljs-addition: dark-light-choose(#2f6f44, #76c490) !default;
$hljs-bg: dark-light-choose($primary-50, rgba(0, 0, 0, 0.25)) !default; $hljs-bg: dark-light-choose($primary-50, rgba(0, 0, 0, 0.25)) !default;
$inline-code-bg: dark-light-choose($primary-100, rgba(0, 0, 0, 0.35)) !default;
$hljs-comment: $primary-500 !default; $hljs-comment: $primary-500 !default;
$hljs-deletion: dark-light-choose(#c02d2e, #de7176) !default; $hljs-deletion: dark-light-choose(#c02d2e, #de7176) !default;
$hljs-keyword: dark-light-choose(#015692, #88aece) !default; $hljs-keyword: dark-light-choose(#015692, #88aece) !default;