From 4046fd0ad9014a22d6e28cfa4ee2575a1121a094 Mon Sep 17 00:00:00 2001 From: Oleksii Holub Date: Thu, 14 Mar 2019 16:02:39 +0200 Subject: [PATCH] [HTML] Add syntax highlighting via Highlight.js Closes #138 --- .../ExportTemplates/HtmlDark/Template.html | 1 + .../Resources/ExportTemplates/HtmlDark/Theme.css | 6 +++--- .../ExportTemplates/HtmlLight/Template.html | 1 + .../Resources/ExportTemplates/HtmlLight/Theme.css | 6 +++--- .../Resources/ExportTemplates/HtmlShared/Main.html | 14 ++++++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Template.html b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Template.html index 57df9654..355d7273 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Template.html +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Template.html @@ -1,2 +1,3 @@ {{~ ThemeStyleSheet = include "HtmlDark.Theme.css" ~}} +{{~ HighlightJsStyleName = "solarized-dark" ~}} {{~ include "HtmlShared.Main.html" ~}} \ No newline at end of file diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Theme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Theme.css index 6766b7c7..5a1f8e2c 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Theme.css +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Theme.css @@ -14,12 +14,12 @@ a { } .pre { - background-color: #2f3136; + background-color: #2f3136 !important; } .pre--multiline { - border-color: #282b30; - color: #839496; + border-color: #282b30 !important; + color: #839496 !important; } .mention { diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Template.html b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Template.html index c867d8b4..f2207849 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Template.html +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Template.html @@ -1,2 +1,3 @@ {{~ ThemeStyleSheet = include "HtmlLight.Theme.css" ~}} +{{~ HighlightJsStyleName = "solarized-light" ~}} {{~ include "HtmlShared.Main.html" ~}} \ No newline at end of file diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Theme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Theme.css index c5082f38..e72751c3 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Theme.css +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Theme.css @@ -14,12 +14,12 @@ a { } .pre { - background-color: #f9f9f9; + background-color: #f9f9f9 !important; } .pre--multiline { - border-color: #f3f3f3; - color: #657b83; + border-color: #f3f3f3 !important; + color: #657b83 !important; } .mention { diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlShared/Main.html b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlShared/Main.html index e8f73a55..2b173087 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlShared/Main.html +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/HtmlShared/Main.html @@ -2,15 +2,29 @@ + {{~ # Metadata ~}} {{ Model.Guild.Name | html.escape }} - {{ Model.Channel.Name | html.escape }} + + {{~ # Styles ~}} + + {{~ # Syntax highlighting ~}} + + +