diff options
| author | Henry Jameson <me@hjkos.com> | 2024-06-22 00:54:23 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-06-22 00:54:23 +0300 |
| commit | 6846b4fe8a1829f8897f48acda7e0a272ffb216e (patch) | |
| tree | 04d798e10db265b26a159e65e5f87f574a911b91 /src/components | |
| parent | aae508f5a14556c34bfad0cd334c25591ce721c3 (diff) | |
| parent | 4c3e2979756fa374eafcd385c6fffc64d8c8ffcd (diff) | |
Merge remote-tracking branch 'origin/develop' into appearance-tab
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 5 | ||||
| -rw-r--r-- | src/components/root.style.js | 2 | ||||
| -rw-r--r-- | src/components/user_card/user_card.js | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 5564b118..563dfb96 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/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) } diff --git a/src/components/root.style.js b/src/components/root.style.js index 3e840a52..f9bdf16e 100644 --- a/src/components/root.style.js +++ b/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)' } } ] diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index e17bf8eb..b1fe2e8f 100644 --- a/src/components/user_card/user_card.js +++ b/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) { |