fixed fonts (post fonts seem to be broken in develop)

src/components/emoji_reactions/emoji_reactions.js

@@ -2,9 +2,10 @@ import StillImage from 'src/components/still-image/still-image.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCheck, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons'
-import { useInstanceStore } from 'src/stores/instance.js'
 
 library.add(faPlus, faMinus, faCheck)
 

src/components/settings_modal/tabs/general_tab.js

@@ -48,9 +48,6 @@ const GeneralTab = {
     },
     ...SharedComputedObject(),
     ...mapState(useInstanceCapabilitiesStore, ['blockExpiration']),
-    ...mapState(useSyncConfigStore, {
-      theme3hacks: (store) => store.mergedConfig.theme3hacks,
-    }),
   },
   methods: {
     updateProfile() {
@@ -67,11 +64,8 @@ const GeneralTab = {
           this.$store.commit('setCurrentUser', user)
         })
     },
-    updateFont(key, value) {
-      useLocalConfigStore().set({
-        path: `theme3hacks.fonts.${key}`,
-        value,
-      })
+    updateFont(path, value) {
+      useLocalConfigStore().set({ path, value })
     },
   },
 }

src/components/settings_modal/tabs/general_tab.vue

@@ -64,21 +64,21 @@
         </li>
         <li>
           <FontControl
-            :model-value="theme3hacks.fonts.interface"
+            :model-value="mergedConfig.fontInterface"
             name="ui"
             :label="$t('settings.style.fonts.components_inline.interface')"
             :fallback="{ family: 'sans-serif' }"
             no-inherit="1"
-            @update:model-value="v => updateFont('interface', v)"
+            @update:model-value="v => updateFont('fontInterface', v)"
           />
         </li>
         <li>
           <FontControl
-            :model-value="theme3hacks.fonts.input"
+            :model-value="mergedConfig.fontInput"
             name="input"
             :fallback="{ family: 'inherit' }"
             :label="$t('settings.style.fonts.components_inline.input')"
-            @update:model-value="v => updateFont('input', v)"
+            @update:model-value="v => updateFont('fontInput', v)"
           />
         </li>
         <li>

src/components/settings_modal/tabs/posts_tab.js

@@ -4,9 +4,10 @@ import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
+import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-const GeneralTab = {
+const PostsTab = {
   data() {
     return {
       conversationDisplayOptions: ['tree', 'linear'].map((mode) => ({
@@ -66,19 +67,10 @@ const GeneralTab = {
     ...SharedComputedObject(),
   },
   methods: {
-    updateFont(key, value) {
-      useSyncConfigStore().setSimplePrefAndSave({
-        path: 'theme3hacks',
-        value: {
-          ...this.mergedConfig.theme3hacks,
-          fonts: {
-            ...this.mergedConfig.theme3hacks.fonts,
-            [key]: value,
-          },
-        },
-      })
+    updateFont(path, value) {
+      useLocalConfigStore().set({ path, value })
     },
   },
 }
 
-export default GeneralTab
+export default PostsTab

src/components/settings_modal/tabs/posts_tab.vue

@@ -56,22 +56,20 @@
         </li>
         <li>
           <FontControl
-            :model-value="mergedConfig.theme3hacks.fonts.post"
+            :model-value="mergedConfig.fontPosts"
             name="post"
-            :is-local="true"
             :fallback="{ family: 'inherit' }"
             :label="$t('settings.style.fonts.components.post')"
-            @update:model-value="v => updateFont('post', v)"
+            @update:model-value="v => updateFont('fontPosts', v)"
           />
         </li>
         <li>
           <FontControl
-            :model-value="mergedConfig.theme3hacks.fonts.monospace"
-            :is-local="true"
+            :model-value="mergedConfig.fontMonospace"
             name="postCode"
             :fallback="{ family: 'monospace' }"
             :label="$t('settings.style.fonts.components.monospace')"
-            @update:model-value="v => updateFont('monospace', v)"
+            @update:model-value="v => updateFont('fontMonospace', v)"
           />
         </li>
         <li>