Commit dee49e38 authored by JC Brand's avatar JC Brand

Avoid horizontal scrolling for messages in Firefox

parent cb8b5a70
...@@ -10828,7 +10828,8 @@ body.reset { ...@@ -10828,7 +10828,8 @@ body.reset {
white-space: pre-wrap; } white-space: pre-wrap; }
#conversejs .message.chat-msg .chat-msg__text a { #conversejs .message.chat-msg .chat-msg__text a {
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; } word-break: break-all;
display: inline-block; }
#conversejs .message.chat-msg .chat-msg__text img.emoji { #conversejs .message.chat-msg .chat-msg__text img.emoji {
height: 1.5em; height: 1.5em;
width: 1.5em; width: 1.5em;
...@@ -10865,6 +10866,9 @@ body.reset { ...@@ -10865,6 +10866,9 @@ body.reset {
padding-bottom: 0.25rem; padding-bottom: 0.25rem;
display: block; } display: block; }
#conversejs .message.chat-msg .chat-msg__heading .chat-msg__author { #conversejs .message.chat-msg .chat-msg__heading .chat-msg__author {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
font-family: "Century Gothic", futura, "URW Gothic L", Verdana, sans-serif; font-family: "Century Gothic", futura, "URW Gothic L", Verdana, sans-serif;
font-size: 115%; } font-size: 115%; }
......
...@@ -79531,13 +79531,13 @@ __p += '**'; ...@@ -79531,13 +79531,13 @@ __p += '**';
}; ; }; ;
__p += __p +=
__e(o.username) + __e(o.username) +
'\n '; '</span>\n ';
o.roles.forEach(function (role) { ; o.roles.forEach(function (role) { ;
__p += ' <span class="badge badge-secondary">' + __p += ' <span class="badge badge-secondary">' +
__e(role) + __e(role) +
'</span> '; '</span> ';
}); ; }); ;
__p += '\n </span>\n '; __p += '\n ';
if (!o.is_me_message) { ; if (!o.is_me_message) { ;
__p += '<time timestamp="' + __p += '<time timestamp="' +
__e(o.isodate) + __e(o.isodate) +
#conversejs { #conversejs {
.message { .message {
.mention { .mention {
font-weight: bold; font-weight: bold;
} }
...@@ -154,6 +153,7 @@ ...@@ -154,6 +153,7 @@
a { a {
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
display: inline-block;
} }
img { img {
&.emoji { &.emoji {
...@@ -209,6 +209,9 @@ ...@@ -209,6 +209,9 @@
display: block; display: block;
.chat-msg__author { .chat-msg__author {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
font-family: $heading-font; font-family: $heading-font;
font-size: 115%; font-size: 115%;
......
...@@ -6,9 +6,8 @@ ...@@ -6,9 +6,8 @@
<div class="chat-msg__content {[ if (o.is_me_message) { ]}chat-msg__content--action{[ } ]}"> <div class="chat-msg__content {[ if (o.is_me_message) { ]}chat-msg__content--action{[ } ]}">
<span class="chat-msg__heading"> <span class="chat-msg__heading">
{[ if (o.is_me_message) { ]}<time timestamp="{{{o.isodate}}}" class="chat-msg__time">{{{o.pretty_time}}}</time>{[ } ]} {[ if (o.is_me_message) { ]}<time timestamp="{{{o.isodate}}}" class="chat-msg__time">{{{o.pretty_time}}}</time>{[ } ]}
<span class="chat-msg__author">{[ if (o.is_me_message) { ]}**{[ }; ]}{{{o.username}}} <span class="chat-msg__author">{[ if (o.is_me_message) { ]}**{[ }; ]}{{{o.username}}}</span>
{[o.roles.forEach(function (role) { ]} <span class="badge badge-secondary">{{{role}}}</span> {[ }); ]} {[o.roles.forEach(function (role) { ]} <span class="badge badge-secondary">{{{role}}}</span> {[ }); ]}
</span>
{[ if (!o.is_me_message) { ]}<time timestamp="{{{o.isodate}}}" class="chat-msg__time">{{{o.pretty_time}}}</time>{[ } ]} {[ if (!o.is_me_message) { ]}<time timestamp="{{{o.isodate}}}" class="chat-msg__time">{{{o.pretty_time}}}</time>{[ } ]}
{[ if (o.is_encrypted) { ]}<span class="fa fa-lock"></span>{[ } ]} {[ if (o.is_encrypted) { ]}<span class="fa fa-lock"></span>{[ } ]}
</span> </span>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment