mirror of
https://git.pleroma.social/sjw/pleroma-fe.git
synced 2025-01-12 16:15:39 +01:00
Merge branch 'fix-develop-issues' into 'develop'
Fix develop issues See merge request pleroma/pleroma-fe!1924
This commit is contained in:
commit
d5157fd4ca
1
changelog.d/fixes.skip
Normal file
1
changelog.d/fixes.skip
Normal file
@ -0,0 +1 @@
|
||||
fix post appearance tab bugs part I
|
@ -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
|
||||
}
|
||||
|
||||
|
@ -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: {
|
||||
|
Loading…
Reference in New Issue
Block a user