Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option See merge request pleroma/pleroma-fe!1106
This commit is contained in:
commit
a8e9c05f09
4 changed files with 12 additions and 2 deletions
|
@ -99,7 +99,12 @@ export default {
|
||||||
},
|
},
|
||||||
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
||||||
isMobileLayout () { return this.$store.state.interface.mobileLayout },
|
isMobileLayout () { return this.$store.state.interface.mobileLayout },
|
||||||
privateMode () { return this.$store.state.instance.private }
|
privateMode () { return this.$store.state.instance.private },
|
||||||
|
sidebarAlign () {
|
||||||
|
return {
|
||||||
|
'order': this.$store.state.instance.sidebarRight ? 99 : 0
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
scrollToTop () {
|
scrollToTop () {
|
||||||
|
|
|
@ -80,7 +80,10 @@
|
||||||
id="content"
|
id="content"
|
||||||
class="container underlay"
|
class="container underlay"
|
||||||
>
|
>
|
||||||
<div class="sidebar-flexer mobile-hidden">
|
<div
|
||||||
|
class="sidebar-flexer mobile-hidden"
|
||||||
|
:style="sidebarAlign"
|
||||||
|
>
|
||||||
<div class="sidebar-bounds">
|
<div class="sidebar-bounds">
|
||||||
<div class="sidebar-scroller">
|
<div class="sidebar-scroller">
|
||||||
<div class="sidebar">
|
<div class="sidebar">
|
||||||
|
|
|
@ -35,6 +35,7 @@ const defaultState = {
|
||||||
scopeCopy: true,
|
scopeCopy: true,
|
||||||
showFeaturesPanel: true,
|
showFeaturesPanel: true,
|
||||||
showInstanceSpecificPanel: false,
|
showInstanceSpecificPanel: false,
|
||||||
|
sidebarRight: false,
|
||||||
subjectLineBehavior: 'email',
|
subjectLineBehavior: 'email',
|
||||||
theme: 'pleroma-dark',
|
theme: 'pleroma-dark',
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
"scopeCopy": true,
|
"scopeCopy": true,
|
||||||
"showFeaturesPanel": true,
|
"showFeaturesPanel": true,
|
||||||
"showInstanceSpecificPanel": false,
|
"showInstanceSpecificPanel": false,
|
||||||
|
"sidebarRight": false,
|
||||||
"subjectLineBehavior": "email",
|
"subjectLineBehavior": "email",
|
||||||
"theme": "pleroma-dark",
|
"theme": "pleroma-dark",
|
||||||
"webPushNotifications": false
|
"webPushNotifications": false
|
||||||
|
|
Loading…
Reference in a new issue