From a16e158216784071949f91074beca4b2e7382017 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Jun 2024 22:16:31 +0300
Subject: [PATCH 1/4] better defaults, fonts scale with panel scale

---
 src/components/settings_modal/tabs/appearance_tab.vue | 4 ++--
 src/modules/instance.js                               | 8 ++++----
 src/panel.scss                                        | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue
index 75126df77..929853f4b 100644
--- a/src/components/settings_modal/tabs/appearance_tab.vue
+++ b/src/components/settings_modal/tabs/appearance_tab.vue
@@ -62,7 +62,7 @@
             path="navbarSize"
             step="0.1"
             :units="['px', 'rem']"
-            :reset-default="{ 'px': 64, 'rem': 3.5 }"
+            :reset-default="{ 'px': 55, 'rem': 3.5 }"
           >
             {{ $t('settings.navbar_size') }}
           </UnitSetting>
@@ -73,7 +73,7 @@
             path="panelHeaderSize"
             step="0.1"
             :units="['px', 'rem']"
-            :reset-default="{ 'px': 64, 'rem': 3.2 }"
+            :reset-default="{ 'px': 52, 'rem': 3.2 }"
             timed-apply-mode
           >
             {{ $t('settings.panel_header_size') }}
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ecfa299f7..30eaddf1f 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -98,11 +98,11 @@ const defaultState = {
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
-  emojiReactionsScale: 1.0,
+  emojiReactionsScale: 0.5,
   textSize: '14px',
-  emojiSize: '2.2em',
-  navbarSize: '3.5em',
-  panelHeaderSize: '3.2em',
+  emojiSize: '2.2rem',
+  navbarSize: '3.5rem',
+  panelHeaderSize: '3.2rem',
   virtualScrolling: true,
   sensitiveByDefault: false,
   conversationDisplay: 'linear',
diff --git a/src/panel.scss b/src/panel.scss
index 7b38cca85..8a54338c2 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -60,11 +60,12 @@
 
 .panel-heading,
 .panel-footer {
-  --panel-heading-height-padding: calc(var(--panelHeaderSize) * 0.15);
+  --panel-heading-height-padding: calc(var(--panelHeaderSize) * 0.2);
   --__panel-heading-gap: calc(var(--panelHeaderSize) * 0.1);
   --__panel-heading-height: var(--panelHeaderSize, 3.2em);
   --__panel-heading-height-inner: calc(var(--__panel-heading-height) - 2 * var(--panel-heading-height-padding, 0));
 
+  font-size: calc(var(--panelHeaderSize) / 3.2);
   backdrop-filter: var(--__panel-backdrop-filter);
   position: relative;
   box-sizing: border-box;

From 80639509b0609f1a9303e3facb1c810a289ea3d1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Jun 2024 22:21:15 +0300
Subject: [PATCH 2/4] fix polls in notifications

---
 src/components/notification/notification.style.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js
index 0d36760a3..c6d317d1c 100644
--- a/src/components/notification/notification.style.js
+++ b/src/components/notification/notification.style.js
@@ -11,7 +11,8 @@ export default {
     'RichContent',
     'Input',
     'Avatar',
-    'Attachment'
+    'Attachment',
+    'PollGraph'
   ],
   defaultRules: []
 }

From 59eb3e734a9dcb8376e46d6ce58249eefedfac7f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Jun 2024 22:52:42 +0300
Subject: [PATCH 3/4] fix panel height for anon visitors

---
 src/panel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panel.scss b/src/panel.scss
index 8a54338c2..6543465ee 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -60,7 +60,7 @@
 
 .panel-heading,
 .panel-footer {
-  --panel-heading-height-padding: calc(var(--panelHeaderSize) * 0.2);
+  --panel-heading-height-padding: calc(var(--panelHeaderSize, 3.2rem) * 0.2);
   --__panel-heading-gap: calc(var(--panelHeaderSize) * 0.1);
   --__panel-heading-height: var(--panelHeaderSize, 3.2em);
   --__panel-heading-height-inner: calc(var(--__panel-heading-height) - 2 * var(--panel-heading-height-padding, 0));

From 1306c46a53ec37bb738b4d6eb32be9c59b2136fe Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Jun 2024 22:52:55 +0300
Subject: [PATCH 4/4] scale navbar font size with its size

---
 src/App.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.scss b/src/App.scss
index a27104360..6b8875bf4 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -159,6 +159,7 @@ nav {
   box-shadow: var(--shadow);
   box-sizing: border-box;
   height: var(--navbar-height);
+  font-size: calc(var(--navbar-height) / 3.5);
   position: fixed;
 }