Merge branch 'threecolumn' into shigusegubu-vue3

* threecolumn:
  localization updates
  properly ignore sticky elements when calculating offset because they technically are following main scroll
  unified layout-setting code and made an option to control or disable third column behavior
This commit is contained in:
Henry Jameson 2022-04-12 22:01:26 +03:00
commit 88c60b3873
8 changed files with 60 additions and 21 deletions

View file

@ -38,6 +38,11 @@ const GeneralTab = {
value: mode,
label: this.$t(`settings.mention_link_display_${mode}`)
})),
thirdColumnModeOptions: ['none', 'notifications', 'postform'].map(mode => ({
key: mode,
value: mode,
label: this.$t(`settings.third_column_mode_${mode}`)
})),
loopSilentAvailable:
// Firefox
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||

View file

@ -70,6 +70,15 @@
{{ $t('settings.show_scrollbars') }}
</BooleanSetting>
</li>
<li>
<ChoiceSetting
id="thirdColumnMode"
path="thirdColumnMode"
:options="thirdColumnModeOptions"
>
{{ $t('settings.third_column_mode') }}
</ChoiceSetting>
</li>
<li>
<BooleanSetting
path="alwaysShowNewPostButton"