diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index 39a2840d96..14b0428f9e 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -73,6 +73,9 @@ These two settings should point to where FE should redirect visitor when they lo ### `scopeCopy` Copy post scope (visibility) when replying to a post. Instance-default. +### `sidebarRight` +Change alignment of sidebar and panels to the right. Defaults to `false`. + ### `showFeaturesPanel` Show panel showcasing instance features/settings to logged-out visitors diff --git a/src/App.js b/src/App.js index 778c467b07..534e9e5d04 100644 --- a/src/App.js +++ b/src/App.js @@ -101,7 +101,12 @@ export default { }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, 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: { scrollToTop () { diff --git a/src/App.vue b/src/App.vue index 16c3e8145b..b6ab90abf4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -80,7 +80,10 @@ id="content" class="container underlay" > -
+
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 34f6d6e7c5..abdba305a2 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { copyInstanceOption('subjectLineBehavior') copyInstanceOption('postContentType') copyInstanceOption('alwaysShowSubjectInput') - copyInstanceOption('noAttachmentLinks') copyInstanceOption('showFeaturesPanel') copyInstanceOption('hideSitename') diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index 76a7073007..b503783fd6 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -2,7 +2,7 @@ -