pleroma-fe

commit: d5157fd4cacccaae89e5d0ab47bceeed32cec54b
parent 4797b13625f5848e3f7d437ec9dcf6073607a647
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Thu, 25 Jul 2024 09:04:33 +0000

Merge branch 'fix-develop-issues' into 'develop'

Fix develop issues

See merge request pleroma/pleroma-fe!1924
Diffstat:
A
changelog.d/fixes.skip
1
+
M
src/App.scss
6
++----
M
src/components/settings_modal/tabs/general_tab.js
6
++++++

3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/changelog.d/fixes.skip b/changelog.d/fixes.skip
@@ -0,0 +1 @@
+fix post appearance tab bugs part I
diff --git a/src/App.scss b/src/App.scss
@@ -3,10 +3,7 @@
 @import "./panel";
 
 :root {
-  --fontSize: 14px;
   --status-margin: 0.75em;
-  --navbar-height: var(--navbarSize, 3.5rem);
-  --panel-header-height: var(--panelHeaderSize, 3.2rem);
   --post-line-height: 1.4;
   // Z-Index stuff
   --ZI_media_modal: 9000;
@@ -21,10 +18,11 @@
 }
 
 html {
-  font-size: var(--textSize);
+  font-size: var(--textSize, 14px);
 
   --navbar-height: var(--navbarSize, 3.5rem);
   --emoji-size: var(--emojiSize, 32px);
+  --panel-header-height: var(--panelHeaderSize, 3.2rem);
   // overflow-x: clip causes my browser's tab to crash with SIGILL lul
 }
 
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
@@ -75,6 +75,12 @@ const GeneralTab = {
         label: this.$t(`post_status.content_type["${format}"]`)
       }))
     },
+    language: {
+      get: function () { return this.$store.getters.mergedConfig.interfaceLanguage },
+      set: function (val) {
+        this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
+      }
+    },
     ...SharedComputedObject()
   },
   methods: {