logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: 8912664ab33a56464929a6086294ce91508bb117
parent bcc9d9b851687f065d7af3b48e28166aa8e9ec20
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 18 Feb 2025 22:37:45 +0200

remove useAtIcon since pretty much everyone hated that and it outlived its usefulness

Diffstat:

Msrc/components/mention_link/mention_link.js3---
Msrc/components/mention_link/mention_link.vue7+------
Msrc/components/settings_modal/tabs/general_tab.vue8--------
Msrc/modules/default_config_state.js1-
Msrc/modules/instance.js1-
5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js @@ -117,9 +117,6 @@ const MentionLink = { this.highlightType ] }, - useAtIcon () { - return this.mergedConfig.useAtIcon - }, isRemote () { return this.userName !== this.userNameFull }, diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue @@ -34,12 +34,7 @@ :user="user" /><span class="shortName" - ><FAIcon - v-if="useAtIcon" - size="sm" - icon="at" - class="at" - />{{ !useAtIcon ? '@' : '' }}<span + >@<span class="userName" v-html="userName" /><span diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue @@ -366,14 +366,6 @@ </BooleanSetting> </li> <li> - <BooleanSetting - path="useAtIcon" - expert="1" - > - {{ $t('settings.use_at_icon') }} - </BooleanSetting> - </li> - <li> <BooleanSetting path="mentionLinkShowAvatar"> {{ $t('settings.mention_link_show_avatar') }} </BooleanSetting> diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js @@ -129,7 +129,6 @@ export const defaultState = { forcedRoundness: undefined, // instance default navbarColumnStretch: false, greentext: undefined, // instance default - useAtIcon: undefined, // instance default mentionLinkDisplay: undefined, // instance default mentionLinkShowTooltip: undefined, // instance default mentionLinkShowAvatar: undefined, // instance default diff --git a/src/modules/instance.js b/src/modules/instance.js @@ -57,7 +57,6 @@ const defaultState = { embeddedToS: true, collapseMessageWithSubject: false, greentext: false, - useAtIcon: false, mentionLinkDisplay: 'short', mentionLinkShowTooltip: true, mentionLinkShowAvatar: false,