pleroma-fe

commit: a8e9c05f09926f1dde09174752c71c6d5822b6f4
parent: 0b44a5b601fc57de53a73784374dc71bc28700c7
Author: Shpuld Shpludson <shp@cock.li>
Date:   Wed, 20 May 2020 15:42:42 +0000

Merge branch 'feat/sidebar-alignment' into 'develop'

[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
Diffstat:
M
src/App.js
7
++++++-
M
src/App.vue
5
++++-
M
src/modules/instance.js
1
+
M
static/config.json
1
+

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/App.js b/src/App.js
@@ -99,7 +99,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
@@ -80,7 +80,10 @@
       id="content"
       class="container underlay"
     >
-      <div class="sidebar-flexer mobile-hidden">
+      <div
+        class="sidebar-flexer mobile-hidden"
+        :style="sidebarAlign"
+      >
         <div class="sidebar-bounds">
           <div class="sidebar-scroller">
             <div class="sidebar">
diff --git a/src/modules/instance.js b/src/modules/instance.js
@@ -35,6 +35,7 @@ const defaultState = {
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
+  sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
 
diff --git a/static/config.json b/static/config.json
@@ -21,6 +21,7 @@
   "scopeCopy": true,
   "showFeaturesPanel": true,
   "showInstanceSpecificPanel": false,
+  "sidebarRight": false,
   "subjectLineBehavior": "email",
   "theme": "pleroma-dark",
   "webPushNotifications": false