diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/mention_link/mention_link.js | 3 | ||||
| -rw-r--r-- | src/components/mention_link/mention_link.vue | 9 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js index 65c62baa..637641af 100644 --- a/src/components/mention_link/mention_link.js +++ b/src/components/mention_link/mention_link.js @@ -85,6 +85,9 @@ const MentionLink = { this.highlightType ] }, + useAtIcon () { + return this.mergedConfig.useAtIcon + }, ...mapGetters(['mergedConfig']), ...mapState({ currentUser: state => state.users.currentUser diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue index a22b486c..f633bf50 100644 --- a/src/components/mention_link/mention_link.vue +++ b/src/components/mention_link/mention_link.vue @@ -24,13 +24,14 @@ > <!-- eslint-disable vue/no-v-html --> <FAIcon + v-if="useAtIcon" size="sm" icon="at" class="at" - /><span class="shortName"><span - class="userName" - v-html="userName" - /></span> + /><span class="shortName">{{ !useAtIcon ? '@' : '' }}<span + class="userName" + v-html="userName" + /></span> <span v-if="isYou" class="you" diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index bd3ee84e..5fec2d89 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -147,6 +147,11 @@ {{ $t('settings.greentext') }} </BooleanSetting> </li> + <li> + <BooleanSetting path="useAtIcon"> + {{ $t('settings.use_at_icon') }} + </BooleanSetting> + </li> </ul> </div> |