mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-23 19:26:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[HTML] Adjust embed color to theme

Browse source
This commit is contained in:
Alexey Golub 2019-12-01 17:50:10 +02:00
parent 0d2ae8b5db
commit cc1bb924e7
5 changed files with 116 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

5
DiscordChatExporter.Core.Models/Embed.cs
View file

@ -14,8 +14,7 @@ namespace DiscordChatExporter.Core.Models
public DateTimeOffset? Timestamp { get; } public DateTimeOffset? Timestamp { get; }
// TODO: this should be nullable and default color should be set in CSS public Color? Color { get; }
public Color Color { get; }
public EmbedAuthor? Author { get; } public EmbedAuthor? Author { get; }
@ -29,7 +28,7 @@ namespace DiscordChatExporter.Core.Models
public EmbedFooter? Footer { get; } public EmbedFooter? Footer { get; }
public Embed(string? title, string? url, DateTimeOffset? timestamp, Color color, EmbedAuthor? author, string? description, public Embed(string? title, string? url, DateTimeOffset? timestamp, Color? color, EmbedAuthor? author, string? description,
IReadOnlyList<EmbedField> fields, EmbedImage? thumbnail, EmbedImage? image, EmbedFooter? footer) IReadOnlyList<EmbedField> fields, EmbedImage? thumbnail, EmbedImage? image, EmbedFooter? footer)
{ {
Title = title; Title = title;

4
DiscordChatExporter.Core.Rendering/Resources/HtmlDark.css
View file

@ -70,6 +70,10 @@ a {
color: rgba(255, 255, 255, 0.2); color: rgba(255, 255, 255, 0.2);
} }
.chatlog__embed-color-pill--default {
background-color: rgba(79, 84, 92, 1);
}
.chatlog__embed-content-container { .chatlog__embed-content-container {
background-color: rgba(46, 48, 54, 0.3); background-color: rgba(46, 48, 54, 0.3);
border-color: rgba(46, 48, 54, 0.6); border-color: rgba(46, 48, 54, 0.6);

4
DiscordChatExporter.Core.Rendering/Resources/HtmlLight.css
View file

@ -73,6 +73,10 @@ a {
color: #747f8d; color: #747f8d;
} }
.chatlog__embed-color-pill--default {
background-color: rgba(227, 229, 232, 1);
}
.chatlog__embed-content-container { .chatlog__embed-content-container {
background-color: rgba(249, 249, 249, 0.3); background-color: rgba(249, 249, 249, 0.3);
border-color: rgba(204, 204, 204, 0.3); border-color: rgba(204, 204, 204, 0.3);

28
DiscordChatExporter.Core.Rendering/Resources/HtmlShared.html
View file

@ -15,12 +15,23 @@
{{ ThemeStyleSheet }} {{ ThemeStyleSheet }}
</style> </style>
{{~ # Syntax highlighting ~}}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/{{HighlightJsStyleName}}.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', () => {
document.querySelectorAll('.pre--multiline').forEach((block) => {
hljs.highlightBlock(block);
});
});
</script>
{{~ # Local scripts ~}} {{~ # Local scripts ~}}
<script> <script>
function scrollToMessage(event, id) { function scrollToMessage(event, id) {
var element = document.getElementById('message-' + id); var element = document.getElementById('message-' + id);
if (element !== null && element !== undefined) { if (element) {
event.preventDefault(); event.preventDefault();
element.classList.add('chatlog__message--highlighted'); element.classList.add('chatlog__message--highlighted');
@ -36,17 +47,6 @@
} }
} }
</script> </script>
{{~ # Syntax highlighting ~}}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/{{HighlightJsStyleName}}.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', () => {
document.querySelectorAll('.pre--multiline').forEach((block) => {
hljs.highlightBlock(block);
});
});
</script>
</head> </head>
<body> <body>
@ -131,7 +131,11 @@
{{~ # Embeds ~}} {{~ # Embeds ~}}
{{~ for embed in message.Embeds ~}} {{~ for embed in message.Embeds ~}}
<div class="chatlog__embed"> <div class="chatlog__embed">
{{~ if embed.Color ~}}
<div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div> <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
{{~ else ~}}
<div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
{{~ end ~}}
<div class="chatlog__embed-content-container"> <div class="chatlog__embed-content-container">
<div class="chatlog__embed-content"> <div class="chatlog__embed-content">
<div class="chatlog__embed-text"> <div class="chatlog__embed-text">

2
DiscordChatExporter.Core.Services/DataService.Parsers.cs
View file

@ -123,7 +123,7 @@ namespace DiscordChatExporter.Core.Services
// Get color // Get color
var color = json["color"] != null var color = json["color"] != null
? Color.FromArgb(json["color"]!.Value<int>()).ResetAlpha() ? Color.FromArgb(json["color"]!.Value<int>()).ResetAlpha()
: Color.FromArgb(79, 84, 92); // default color : default(Color?);
// Get author // Get author
var author = json["author"] != null ? ParseEmbedAuthor(json["author"]!) : null; var author = json["author"] != null ? ParseEmbedAuthor(json["author"]!) : null;