From c246c2b77ad1bef648fcde94feae8835dc716ef1 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Mon, 5 Jul 2021 21:03:34 +0100
Subject: [PATCH] Fix: Changing font reset overrides. Fix: Left test string in
friends.
---
src/pages/friends/Friends.tsx | 2 --
src/pages/settings/panes/Appearance.tsx | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/pages/friends/Friends.tsx b/src/pages/friends/Friends.tsx
index cb0c85c..9c907ff 100644
--- a/src/pages/friends/Friends.tsx
+++ b/src/pages/friends/Friends.tsx
@@ -210,8 +210,6 @@ export default function Friends() {
</CollapsibleSection>
);
})}
-
-<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><h1>test</h1>
</div>
</>
);
diff --git a/src/pages/settings/panes/Appearance.tsx b/src/pages/settings/panes/Appearance.tsx
index 7e16d1c..caedd90 100644
--- a/src/pages/settings/panes/Appearance.tsx
+++ b/src/pages/settings/panes/Appearance.tsx
@@ -152,7 +152,7 @@ export function Component(props: Props) {
<ComboBox
value={theme.font ?? DEFAULT_FONT}
onChange={(e) =>
- setTheme({ custom: { font: e.currentTarget.value as any } })
+ pushOverride({ font: e.currentTarget.value as any })
}>
{FONT_KEYS.map((key) => (
<option value={key}>
@@ -335,10 +335,8 @@ export function Component(props: Props) {
<ComboBox
value={theme.monoscapeFont ?? DEFAULT_MONO_FONT}
onChange={(e) =>
- setTheme({
- custom: {
- monoscapeFont: e.currentTarget.value as any,
- },
+ pushOverride({
+ monoscapeFont: e.currentTarget.value as any,
})
}>
{MONOSCAPE_FONT_KEYS.map((key) => (
--
GitLab