From 2a510fe2300c5b4eab9060b2b9ce43090af15ba6 Mon Sep 17 00:00:00 2001
From: Matthias Metelka <62722460+kleinerpirat@users.noreply.github.com>
Date: Wed, 2 Nov 2022 12:33:35 +0100
Subject: [PATCH] Set same font size for all platforms and make editor UI a bit
 smaller (#2171)

* Use single base font size for all platforms

* Change 1.6em values to 1.5em in editor
---
 sass/base.scss                                  | 13 +------------
 ts/components/Switch.svelte                     |  2 +-
 ts/editor/NoteEditor.svelte                     |  2 +-
 ts/editor/image-overlay/FloatButtons.svelte     |  2 +-
 ts/editor/image-overlay/SizeSelect.svelte       |  2 +-
 ts/editor/mathjax-overlay/MathjaxButtons.svelte |  2 +-
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/sass/base.scss b/sass/base.scss
index 9001bcdfa..266fdade1 100644
--- a/sass/base.scss
+++ b/sass/base.scss
@@ -44,6 +44,7 @@ html {
 }
 
 body {
+    --base-font-size: 13px;
     overscroll-behavior: none;
     &:not(.isMac),
     &:not(.isMac) * {
@@ -65,18 +66,6 @@ samp {
     unicode-bidi: normal !important;
 }
 
-.isWin {
-    --base-font-size: 12px;
-}
-
-.isMac {
-    --base-font-size: 13px;
-}
-
-.isLin {
-    --base-font-size: 14px;
-}
-
 [dir="rtl"] {
     .form-select {
         /* flip <select>'s arrow */
diff --git a/ts/components/Switch.svelte b/ts/components/Switch.svelte
index 5b2b20dc3..43fc1013a 100644
--- a/ts/components/Switch.svelte
+++ b/ts/components/Switch.svelte
@@ -30,7 +30,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     .form-check-input {
         -webkit-appearance: none;
-        height: 1.6em;
+        height: 1.5em;
         /* otherwise the switch circle shows slightly off-centered */
         margin-top: 0;
 
diff --git a/ts/editor/NoteEditor.svelte b/ts/editor/NoteEditor.svelte
index 207dc9680..bcded1ebc 100644
--- a/ts/editor/NoteEditor.svelte
+++ b/ts/editor/NoteEditor.svelte
@@ -79,7 +79,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return fontFamily;
     }
 
-    const size = 1.6;
+    const size = 1.5;
     const wrap = true;
 
     const fieldStores: Writable<string>[] = [];
diff --git a/ts/editor/image-overlay/FloatButtons.svelte b/ts/editor/image-overlay/FloatButtons.svelte
index f75d82ae6..9f8c5664c 100644
--- a/ts/editor/image-overlay/FloatButtons.svelte
+++ b/ts/editor/image-overlay/FloatButtons.svelte
@@ -27,7 +27,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const dispatch = createEventDispatcher();
 </script>
 
-<ButtonGroup size={1.6} wrap={false}>
+<ButtonGroup size={1.5} wrap={false}>
     <IconButton
         tooltip={tr.editingFloatLeft()}
         active={floatStyle === "left"}
diff --git a/ts/editor/image-overlay/SizeSelect.svelte b/ts/editor/image-overlay/SizeSelect.svelte
index 022b3aad5..f97c8328a 100644
--- a/ts/editor/image-overlay/SizeSelect.svelte
+++ b/ts/editor/image-overlay/SizeSelect.svelte
@@ -22,7 +22,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const dispatch = createEventDispatcher();
 </script>
 
-<ButtonGroup size={1.6}>
+<ButtonGroup size={1.5}>
     <IconButton
         disabled={shrinkingDisabled}
         flipX={$direction === "rtl"}
diff --git a/ts/editor/mathjax-overlay/MathjaxButtons.svelte b/ts/editor/mathjax-overlay/MathjaxButtons.svelte
index b60259b76..48df2bc60 100644
--- a/ts/editor/mathjax-overlay/MathjaxButtons.svelte
+++ b/ts/editor/mathjax-overlay/MathjaxButtons.svelte
@@ -17,7 +17,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const dispatch = createEventDispatcher();
 </script>
 
-<ButtonToolbar size={1.6} wrap={false}>
+<ButtonToolbar size={1.5} wrap={false}>
     <ButtonGroup>
         <IconButton
             tooltip={tr.editingMathjaxInline()}