logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: d157f6738195325c59870fe02df8fa16985c84af
parent fa20ea76b1b6cacf2f16fe27624ab2b29381e365
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Sun,  6 Mar 2022 14:13:35 -0500

Make fading ancestors optional

Diffstat:

Msrc/components/conversation/conversation.js3+++
Msrc/components/conversation/conversation.vue4++--
Msrc/components/settings_modal/tabs/general_tab.vue5+++++
Msrc/modules/config.js1+
Msrc/modules/instance.js1+
5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js @@ -89,6 +89,9 @@ const conversation = { isLinearView () { return this.displayStyle === 'linear' }, + shouldFadeAncestors () { + return this.$store.getters.mergedConfig.conversationTreeFadeAncestors + }, otherRepliesButtonPosition () { return this.$store.getters.mergedConfig.conversationOtherRepliesButton }, diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue @@ -50,7 +50,7 @@ v-for="status in ancestorsOf(diveRoot)" :key="status.id" class="thread-ancestor" - :class="{'thread-ancestor-has-other-replies': getReplies(status.id).length > 1}" + :class="{'thread-ancestor-has-other-replies': getReplies(status.id).length > 1, '-faded': shouldFadeAncestors}" > <status ref="statusComponent" @@ -210,7 +210,7 @@ border-left: 2px solid var(--border, $fallback--border); } - .thread-ancestor .StatusContent { + .thread-ancestor.-faded .StatusContent { --link: var(--faintLink); --text: var(--faint); color: var(--text); diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue @@ -171,6 +171,11 @@ </BooleanSetting> </li> <li> + <BooleanSetting path="conversationTreeFadeAncestors"> + {{ $t('settings.tree_fade_ancestors') }} + </BooleanSetting> + </li> + <li> <label for="maxDepthInThread"> {{ $t('settings.max_depth_in_thread') }} </label> diff --git a/src/modules/config.js b/src/modules/config.js @@ -87,6 +87,7 @@ export const defaultState = { conversationDisplay: undefined, // instance default conversationTreeAdvanced: undefined, // instance default conversationOtherRepliesButton: undefined, // instance default + conversationTreeFadeAncestors: undefined, // instance default maxDepthInThread: 6 } diff --git a/src/modules/instance.js b/src/modules/instance.js @@ -56,6 +56,7 @@ const defaultState = { conversationDisplay: 'linear', conversationTreeAdvanced: false, conversationOtherRepliesButton: 'below', + conversationTreeFadeAncestors: false, maxDepthInThread: 6, // Nasty stuff