diff --git a/sass/_messages.scss b/sass/_messages.scss
index c077b2cc5..c28c5846b 100644
--- a/sass/_messages.scss
+++ b/sass/_messages.scss
@@ -130,7 +130,21 @@
margin-left: 0.5rem;
width: calc(100% - var(--message-avatar-width));
}
+
+ .chat-msg__content--me {
+ .chat-msg__body--groupchat {
+ .chat-msg__text {
+ color: var(--subdued-color);
+ }
+ &.chat-msg__body--delayed .chat-msg__text,
+ &.chat-msg__body--received .chat-msg__text {
+ color: var(--message-text-color);
+ }
+ }
+ }
+
.chat-msg__content--action {
+ width: 100%;
margin-left: 0;
}
@@ -164,8 +178,8 @@
}
.chat-msg__text {
- padding: 0;
color: var(--message-text-color);
+ padding: 0;
width: 100%;
white-space: pre-wrap;
a {
@@ -255,7 +269,7 @@
}
&.chat-msg--action {
.chat-msg__content {
- flex-wrap: wrap;
+ flex-wrap: nowrap;
flex-direction: row;
justify-content: flex-start;
}
@@ -286,6 +300,7 @@
}
.chat-msg__content {
margin-left: 2.75rem;
+ width: 100%;
}
}
diff --git a/spec/messages.js b/spec/messages.js
index ad6c51f0e..2c83e8632 100644
--- a/spec/messages.js
+++ b/spec/messages.js
@@ -2301,7 +2301,7 @@
expect(view.model.messages.last().get('affiliation')).toBe('owner');
expect(view.model.messages.last().get('role')).toBe('moderator');
expect(view.el.querySelectorAll('.chat-msg').length).toBe(1);
- expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author chat-msg__me moderator');
+ expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author moderator');
let presence = $pres({
to:'romeo@montague.lit/orchard',
@@ -2328,7 +2328,7 @@
expect(view.model.messages.last().get('affiliation')).toBe('member');
expect(view.model.messages.last().get('role')).toBe('participant');
expect(view.el.querySelectorAll('.chat-msg').length).toBe(2);
- expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author chat-msg__me participant');
+ expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author participant');
presence = $pres({
to:'romeo@montague.lit/orchard',
@@ -2348,7 +2348,7 @@
expect(view.model.messages.last().get('affiliation')).toBe('owner');
expect(view.model.messages.last().get('role')).toBe('moderator');
expect(view.el.querySelectorAll('.chat-msg').length).toBe(3);
- expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author chat-msg__me moderator');
+ expect(sizzle('.chat-msg__author', view.el).pop().classList.value.trim()).toBe('chat-msg__author moderator');
done();
}));
@@ -2562,21 +2562,24 @@
keyCode: 13 // Enter
});
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
+ expect(view.el.querySelectorAll('.chat-msg__body.chat-msg__body--received').length).toBe(0);
+
const msg_obj = view.model.messages.at(0);
const stanza = u.toStanza(`