merge: Merge Upstream Changes (!408)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/408 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-12 23:14:55 +00:00 · 2024-02-12 23:14:55 +00:00 · 4007fbb8d8
commit 4007fbb8d8
parent 2d125137a5 2e7df3297c
149 changed files with 1936 additions and 697 deletions
--- a/packages/frontend/src/themes/_dark.json5
+++ b/packages/frontend/src/themes/_dark.json5
@ -95,4 +95,8 @@
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
 	},
+
+	codeHighlighter: {
+		base: 'one-dark-pro',
+	},
 }
--- a/packages/frontend/src/themes/_light.json5
+++ b/packages/frontend/src/themes/_light.json5
@ -95,4 +95,8 @@
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
 	},
+
+	codeHighlighter: {
+		base: 'catppuccin-latte',
+	},
 }