Merge branch 'master' into devel
This commit is contained in:
commit
9ac475c25e
BIN
public/cf/zz.gif
Normal file
BIN
public/cf/zz.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 210 B |
|
@ -45,7 +45,7 @@ function ChatMessage({
|
|||
<div className="msgcont">
|
||||
<span className={className}>
|
||||
{(!isInfo && !isEvent) && (
|
||||
<span key="name">
|
||||
<React.Fragment key="name">
|
||||
<img
|
||||
className="chatflag"
|
||||
alt=""
|
||||
|
@ -63,6 +63,7 @@ function ChatMessage({
|
|||
cursor: 'pointer',
|
||||
}}
|
||||
role="button"
|
||||
title={name}
|
||||
tabIndex={-1}
|
||||
onClick={(event) => {
|
||||
const {
|
||||
|
@ -79,9 +80,11 @@ function ChatMessage({
|
|||
{name}
|
||||
</span>
|
||||
{': '}
|
||||
</span>
|
||||
</React.Fragment>
|
||||
)}
|
||||
<MarkdownParagraph refEmbed={refEmbed} pArray={pArray} />
|
||||
<span>
|
||||
<MarkdownParagraph refEmbed={refEmbed} pArray={pArray} />
|
||||
</span>
|
||||
</span>
|
||||
<span className="chatts">
|
||||
{getDateTimeString(ts)}
|
||||
|
|
|
@ -418,7 +418,7 @@ export class ChatProvider {
|
|||
const country = user.regUser.flag || 'xx';
|
||||
let displayCountry = country;
|
||||
if (user.userlvl !== 0) {
|
||||
displayCountry = 'fa';
|
||||
displayCountry = 'zz';
|
||||
} else if (name.endsWith('berg') || name.endsWith('stein')) {
|
||||
displayCountry = 'il';
|
||||
} else if (user.id === 2927) {
|
||||
|
|
|
@ -188,7 +188,6 @@ tr:nth-child(even) {
|
|||
.win-topbar {
|
||||
display: flex;
|
||||
height: 24px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.win-title {
|
||||
|
@ -690,16 +689,14 @@ tr:nth-child(even) {
|
|||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
display: inline-block;
|
||||
max-width: 80px;
|
||||
vertical-align: middle;
|
||||
max-width: 95px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.mention, .ping {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
display: inline-block;
|
||||
max-width: 90px;
|
||||
vertical-align: middle;
|
||||
max-width: 85px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.chatts {
|
||||
|
@ -711,7 +708,7 @@ tr:nth-child(even) {
|
|||
.chatmsg {
|
||||
font-size: 13px;
|
||||
user-select: text;
|
||||
padding: 2px 0 2px 2px;
|
||||
padding: 3px 0 3px 2px;
|
||||
}
|
||||
.chatmsg:hover {
|
||||
background-color: #dadada;
|
||||
|
@ -724,6 +721,10 @@ tr:nth-child(even) {
|
|||
overflow-y: clip;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
.msg span {
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.msg.info {
|
||||
color: #cc0000;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user