aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/tabs/general_tab.vue
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2022-02-03 19:37:13 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2022-02-03 19:37:13 +0000
commit8ade11783aa4740a2cff61f27938f3408c3e0eb0 (patch)
tree0e61058d7c82e9aa225c32b36d460a6e24acd03e /src/components/settings_modal/tabs/general_tab.vue
parenta5e20a4eb25864889dbc7dff1a6a9ad2cb98735b (diff)
parentc3f1765b21f0312347ad8f1e514d5bc534121fcc (diff)
Merge branch 'from/develop/tusooa/1118-enhanced-mention-link' into 'develop'
Enhanced mention link Closes #1118 See merge request pleroma/pleroma-fe!1424
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
-rw-r--r--src/components/settings_modal/tabs/general_tab.vue35
1 files changed, 35 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index bd3ee84e..44b1ac92 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -147,6 +147,41 @@
{{ $t('settings.greentext') }}
</BooleanSetting>
</li>
+ <li>
+ <ChoiceSetting
+ id="mentionLinkDisplay"
+ path="mentionLinkDisplay"
+ :options="mentionLinkDisplayOptions"
+ >
+ {{ $t('settings.mention_link_display') }}
+ </ChoiceSetting>
+ </li>
+ <ul
+ class="setting-list suboptions"
+ >
+ <li
+ v-if="mentionLinkDisplay === 'short'"
+ >
+ <BooleanSetting path="mentionLinkShowTooltip">
+ {{ $t('settings.mention_link_show_tooltip') }}
+ </BooleanSetting>
+ </li>
+ <li>
+ <BooleanSetting path="useAtIcon">
+ {{ $t('settings.use_at_icon') }}
+ </BooleanSetting>
+ </li>
+ <li>
+ <BooleanSetting path="mentionLinkShowAvatar">
+ {{ $t('settings.mention_link_show_avatar') }}
+ </BooleanSetting>
+ </li>
+ <li>
+ <BooleanSetting path="mentionLinkFadeDomain">
+ {{ $t('settings.mention_link_fade_domain') }}
+ </BooleanSetting>
+ </li>
+ </ul>
</ul>
</div>