Merge remote-tracking branch 'origin/develop' into appearance-tab

src/components/post_status_form/post_status_form.js

@@ -87,7 +87,8 @@ const PostStatusForm = {
     'fileLimit',
     'submitOnEnter',
     'emojiPickerPlacement',
-    'optimisticPosting'
+    'optimisticPosting',
+    'profileMention'
   ],
   emits: [
     'posted',
@@ -125,7 +126,7 @@ const PostStatusForm = {
 
     const { scopeCopy } = this.$store.getters.mergedConfig
 
-    if (this.replyTo) {
+    if (this.replyTo || this.profileMention) {
       const currentUser = this.$store.state.users.currentUser
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }

src/components/root.style.js

@@ -37,7 +37,7 @@ export default {
 
         // Selection colors
         '--selectionBackground': 'color | --accent',
-        '--selectionText': 'color | $textColor(--accent, --text)'
+        '--selectionText': 'color | $textColor(--accent, --text, no-preserve)'
       }
     }
   ]

src/components/user_card/user_card.js

@@ -225,7 +225,7 @@ export default {
       this.$store.dispatch('setCurrentMedia', attachment)
     },
     mentionUser () {
-      this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
+      this.$store.dispatch('openPostStatusModal', { profileMention: true, repliedUser: this.user })
     },
     onAvatarClickHandler (e) {
       if (this.onAvatarClick) {