From 7ecf90d1cb16394961ff563b837c056030b6288b Mon Sep 17 00:00:00 2001
From: Alexey Golub <Tyrrrrrr@gmail.com>
Date: Tue, 26 Jun 2018 01:14:54 +0300
Subject: [PATCH] Refactor css for 'pre' with modifiers

---
 .../Resources/ExportTemplates/Html/DarkTheme.css  | 11 +++++------
 .../Resources/ExportTemplates/Html/LightTheme.css |  7 +++----
 .../Resources/ExportTemplates/Html/Shared.css     | 15 ++++++++-------
 .../Services/ExportService.TemplateModel.cs       |  4 ++--
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
index 6f18370..998abaa 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
@@ -9,14 +9,13 @@ a {
     color: #0096cf;
 }
 
-.pre-multiline {
-    background-color: #2F3136;
-    border-color: #282b30;
-    color: #839496;
+.pre {
+    background-color: #2f3136;
 }
 
-.pre-inline {
-    background-color: #2f3136;
+.pre--multiline {
+    border-color: #282b30;
+    color: #839496;
 }
 
 .mention {
diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
index 11aaa88..2b3999c 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
@@ -9,13 +9,12 @@ a {
     color: #00b0f4;
 }
 
-.pre-multiline {
+.pre {
     background-color: #f9f9f9;
-    color: #657b83;
 }
 
-.pre-inline {
-    background-color: #f9f9f9;
+.pre--multiline {
+    color: #657b83;
 }
 
 /* === INFO === */
diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css
index 5acf6d7..0661949 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css
@@ -17,20 +17,21 @@ img {
     object-fit: contain;
 }
 
-.pre-multiline {
+.pre {
+    font-family: "Consolas", "Courier New", Courier, Monospace;
+    white-space: pre-wrap;
+}
+
+.pre--multiline {
     margin-top: 4px;
     padding: 8px;
     border: 2px solid;
-    border-radius: 5px;
-    font-family: "Consolas", "Courier New", Courier, Monospace;
-    white-space: pre-wrap;
+    border-radius: 5px;    
 }
 
-.pre-inline {
+.pre--inline {
     padding: 2px;
     border-radius: 3px;
-    font-family: "Consolas", "Courier New", Courier, Monospace;
-    white-space: pre-wrap;
 }
 
 .emoji {
diff --git a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
index 8063b19..b5920c3 100644
--- a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
+++ b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
@@ -146,11 +146,11 @@ namespace DiscordChatExporter.Core.Services
 
                 // Decode and process multiline codeblocks
                 content = Regex.Replace(content, "\x1AM(.*?)\x1AM",
-                    m => $"<div class=\"pre-multiline\">{m.Groups[1].Value.Base64Decode()}</div>");
+                    m => $"<div class=\"pre pre--multiline\">{m.Groups[1].Value.Base64Decode()}</div>");
 
                 // Decode and process inline codeblocks
                 content = Regex.Replace(content, "\x1AI(.*?)\x1AI",
-                    m => $"<span class=\"pre-inline\">{m.Groups[1].Value.Base64Decode()}</span>");
+                    m => $"<span class=\"pre pre--inline\">{m.Groups[1].Value.Base64Decode()}</span>");
 
                 // Decode and process links
                 if (allowLinks)