From 01389b7e280070871e6b96d14ca5acc2f63720ce Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 28 Jun 2022 21:18:57 +0300
Subject: [PATCH] Fix rendering of code blocks in HTML

---
 .../Exporting/Writers/Html/PreambleTemplate.cshtml        | 8 +++++---
 .../Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs       | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
index a25b745..f4e5afe 100644
--- a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
+++ b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
@@ -632,9 +632,11 @@
         .chatlog__markdown-pre {
             background-color: @Themed("#2f3136", "#f9f9f9");
             font-family: "Consolas", "Courier New", Courier, monospace;
+            font-size: 0.85rem;
         }
 
         .chatlog__markdown-pre--multiline {
+            display: block;
             margin-top: 0.25rem;
             padding: 0.5rem;
             border: 2px solid @Themed("#282b30", "#f3f3f3");
@@ -643,14 +645,14 @@
         }
 
         .chatlog__markdown-pre--multiline.hljs {
-            background-color: inherit;
-            color: inherit;
+            background-color: @Themed("#2f3136", "#f9f9f9");
+            color: @Themed("#b9bbbe", "#657b83");
         }
 
         .chatlog__markdown-pre--inline {
+            display: inline-block;
             padding: 2px;
             border-radius: 3px;
-            font-size: 0.85rem;
         }
 
         .chatlog__markdown-mention {
diff --git a/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs b/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs
index ef14c08..71942b0 100644
--- a/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs
+++ b/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs
@@ -76,9 +76,9 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
     protected override MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock)
     {
         _buffer
-            .Append("<span class=\"chatlog__markdown-pre chatlog__markdown-pre--inline\">")
+            .Append("<code class=\"chatlog__markdown-pre chatlog__markdown-pre--inline\">")
             .Append(HtmlEncode(inlineCodeBlock.Code))
-            .Append("</span>");
+            .Append("</code>");
 
         return base.VisitInlineCodeBlock(inlineCodeBlock);
     }
@@ -90,9 +90,9 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
             : "nohighlight";
 
         _buffer
-            .Append($"<div class=\"chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightCssClass}\">")
+            .Append($"<code class=\"chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightCssClass}\">")
             .Append(HtmlEncode(multiLineCodeBlock.Code))
-            .Append("</div>");
+            .Append("</code>");
 
         return base.VisitMultiLineCodeBlock(multiLineCodeBlock);
     }