diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-20 15:42:42 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-20 15:42:42 +0000 |
| commit | a8e9c05f09926f1dde09174752c71c6d5822b6f4 (patch) | |
| tree | 803de4e4b6c5b63b1028a453aaa52311d4cf5063 | |
| parent | 0b44a5b601fc57de53a73784374dc71bc28700c7 (diff) | |
| parent | 2135dc8510d50b4c37765364afdde3f275708e3f (diff) | |
Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option
See merge request pleroma/pleroma-fe!1106
| -rw-r--r-- | src/App.js | 7 | ||||
| -rw-r--r-- | src/App.vue | 5 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 | ||||
| -rw-r--r-- | static/config.json | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -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 index ff62fc51..7018a5a4 100644 --- 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 index 94d4176b..da82eb01 100644 --- 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 index 74947314..0030f78f 100644 --- 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 |