diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-07-25 09:04:33 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-07-25 09:04:33 +0000 |
| commit | d5157fd4cacccaae89e5d0ab47bceeed32cec54b (patch) | |
| tree | 1245b45bdc1456a8171e3b923cacdc5ac4d0c6ae /src | |
| parent | 4797b13625f5848e3f7d437ec9dcf6073607a647 (diff) | |
| parent | e88cbe3421328ae7fcb5cd77786d6242e9fcf0e2 (diff) | |
Merge branch 'fix-develop-issues' into 'develop'
Fix develop issues
See merge request pleroma/pleroma-fe!1924
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.scss | 6 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.js | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/App.scss b/src/App.scss index bd924487..9d1ce77a 100644 --- 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 index 96caab07..e9e8fa72 100644 --- 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: { |