aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/mentions_line/mentions_line.scss2
-rw-r--r--src/components/rich_content/rich_content.jsx7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/components/mentions_line/mentions_line.scss b/src/components/mentions_line/mentions_line.scss
index 222940c8..50eb0c27 100644
--- a/src/components/mentions_line/mentions_line.scss
+++ b/src/components/mentions_line/mentions_line.scss
@@ -4,7 +4,7 @@
color: var(--link);
}
- .mention-link:not(:last-child) {
+ .mention-link {
margin-right: 0.25em;
}
}
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 1353541f..8ab007e3 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -121,6 +121,13 @@ export default Vue.component('RichContent', {
// in MentionsLine
return currentMentions !== null ? item.trim() : item
}
+ // We add space with mentionsLine, otherwise non-text elements will
+ // stick to them.
+ if (currentMentions !== null) {
+ // single whitespace trim
+ item = item[0].match(/\s/) ? item.slice(1) : item
+ }
+
currentMentions = null
if (item.includes(':')) {
item = ['', processTextForEmoji(