diff --git a/src/App.js b/src/App.js index 362ac19d..558f462f 100644 --- a/src/App.js +++ b/src/App.js @@ -72,6 +72,9 @@ export default { !this.$store.getters.mergedConfig.hideISP && this.$store.state.instance.instanceSpecificPanelContent }, + thirdColumnEnabled () { + return this.$store.getters.mergedConfig.showThirdColumn || false + }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, hideShoutbox () { return this.$store.getters.mergedConfig.hideShoutbox @@ -83,6 +86,16 @@ export default { 'order': this.$store.getters.mergedConfig.sidebarRight ? 99 : 0 } }, + notifsAlign () { + return { + 'order': this.$store.getters.mergedConfig.sidebarRight ? 0 : 99 + } + }, + thirdColumnLayout () { + return { + 'max-width': this.$store.getters.mergedConfig.showThirdColumn ? '1400px' : '980px' + } + }, ...mapGetters(['mergedConfig']) }, methods: { diff --git a/src/App.scss b/src/App.scss index 45071ba2..b1a12446 100644 --- a/src/App.scss +++ b/src/App.scss @@ -573,9 +573,10 @@ nav { } .main { - flex-basis: 50%; + flex-basis: 25%; flex-grow: 1; flex-shrink: 1; + order: 50; } .sidebar-bounds { diff --git a/src/App.vue b/src/App.vue index c30f5e98..3ced79c6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,7 @@
- +
-
+
+ +
+
  • + + {{ $t('settings.show_third_column') }} + +
  • {{ $t('settings.hide_wallpaper') }} diff --git a/src/i18n/en.json b/src/i18n/en.json index 01d7682e..7b7e210e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -449,6 +449,7 @@ "reset_banner_confirm": "Do you really want to reset the banner?", "reset_background_confirm": "Do you really want to reset the background?", "settings": "Settings", + "show_third_column": "Show separate notifications column", "subject_input_always_show": "Always show subject field", "subject_line_behavior": "Copy subject when replying", "subject_line_email": "Like email: \"re: subject\"", diff --git a/src/modules/config.js b/src/modules/config.js index 33e2cb50..9f1ac5b8 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -56,6 +56,7 @@ export const defaultState = { hideScopeNotice: false, useStreamingApi: false, sidebarRight: undefined, // instance default + showThirdColumn: false, // instance default scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default alwaysShowSubjectInput: undefined, // instance default