more granular picker for the wide-timeline

This commit is contained in:
sdomi 2024-06-26 18:43:32 +02:00 committed by Jeder
parent 9c63e954f2
commit 8c4a1b26a3
6 changed files with 27 additions and 12 deletions

View file

@ -59,12 +59,19 @@ export default {
{ {
'-reverse': this.reverseLayout, '-reverse': this.reverseLayout,
'-no-sticky-headers': this.noSticky, '-no-sticky-headers': this.noSticky,
'-has-new-post-button': this.newPostButtonShown, '-has-new-post-button': this.newPostButtonShown
'-wide-timeline': this.widenTimeline
}, },
'-' + this.layoutType '-' + this.layoutType,
] ]
}, },
columnWidth() {
let type = this.$store.getters.mergedConfig.widenTimeline
console.log(type);
if (type && type !== 'off') {
return `minmax(var(--miniColumn), ${type})`
}
return 'minmax(var(--miniColumn), 45rem)'
},
pageBackground () { pageBackground () {
return this.mergedConfig.displayPageBackgrounds return this.mergedConfig.displayPageBackgrounds
? this.$store.state.users.displayBackground ? this.$store.state.users.displayBackground
@ -94,9 +101,6 @@ export default {
newPostButtonShown () { newPostButtonShown () {
return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile' return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile'
}, },
widenTimeline () {
return this.$store.getters.mergedConfig.widenTimeline
},
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
editingAvailable () { return this.$store.state.instance.editingAvailable }, editingAvailable () { return this.$store.state.instance.editingAvailable },
layoutType () { return this.$store.state.interface.layoutType }, layoutType () { return this.$store.state.interface.layoutType },

View file

@ -195,10 +195,6 @@ nav {
min-height: 100vh; min-height: 100vh;
overflow-x: clip; overflow-x: clip;
&.-wide-timeline {
--maxiColumn: minmax(var(--miniColumn), 1fr);
}
.column { .column {
--___columnMargin: var(--columnGap); --___columnMargin: var(--columnGap);

View file

@ -14,6 +14,7 @@
id="content" id="content"
class="app-layout container" class="app-layout container"
:class="classes" :class="classes"
:style="{'--maxiColumn': this.columnWidth}"
> >
<div class="underlay" /> <div class="underlay" />
<div <div

View file

@ -55,6 +55,11 @@ const GeneralTab = {
value: tab, value: tab,
label: this.$t(`user_card.${tab}`) label: this.$t(`user_card.${tab}`)
})), })),
widenTimelineOptions : ['1fr', '75%', '50%', 'off'].map(width => ({
key: width,
value: width,
label: this.$t(`settings.widen_timeline_option.${width}`)
})),
profilesExpanded: false, profilesExpanded: false,
newProfileName: '', newProfileName: '',
loopSilentAvailable: loopSilentAvailable:

View file

@ -270,9 +270,12 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="widenTimeline"> <ChoiceSetting
path="widenTimeline"
:options="widenTimelineOptions"
>
{{ $t('settings.widen_timeline') }} {{ $t('settings.widen_timeline') }}
</BooleanSetting> </ChoiceSetting>
</li> </li>
<li> <li>
<ChoiceSetting <ChoiceSetting

View file

@ -949,6 +949,12 @@
"virtual_scrolling": "Optimize timeline rendering", "virtual_scrolling": "Optimize timeline rendering",
"use_blurhash": "Use blurhashes for NSFW thumbnails", "use_blurhash": "Use blurhashes for NSFW thumbnails",
"widen_timeline": "Widen the Timeline to fill horizontal space", "widen_timeline": "Widen the Timeline to fill horizontal space",
"widen_timeline_option": {
"1fr": "Full",
"75%": "75%",
"50%": "50%",
"off": "Off"
},
"word_filter": "Word filter", "word_filter": "Word filter",
"wordfilter": "Wordfilter" "wordfilter": "Wordfilter"
}, },