ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
HF 2022-08-14 11:05:08 +02:00
commit 9ac475c25e
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/cf/zz.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 B

9
src/components/ChatMessage.jsx
View File

@ -45,7 +45,7 @@ function ChatMessage({
<div className="msgcont"> <div className="msgcont">
<span className={className}> <span className={className}>
{(!isInfo && !isEvent) && ( {(!isInfo && !isEvent) && (
<span key="name"> <React.Fragment key="name">
<img <img
className="chatflag" className="chatflag"
alt="" alt=""
@ -63,6 +63,7 @@ function ChatMessage({
cursor: 'pointer', cursor: 'pointer',
}} }}
role="button" role="button"
title={name}
tabIndex={-1} tabIndex={-1}
onClick={(event) => { onClick={(event) => {
const { const {
@ -79,9 +80,11 @@ function ChatMessage({
{name} {name}
</span> </span>
{': '} {': '}
</span> </React.Fragment>
)} )}
<MarkdownParagraph refEmbed={refEmbed} pArray={pArray} /> <span>
<MarkdownParagraph refEmbed={refEmbed} pArray={pArray} />
</span>
</span> </span>
<span className="chatts"> <span className="chatts">
{getDateTimeString(ts)} {getDateTimeString(ts)}

2
src/core/ChatProvider.js
View File

@ -418,7 +418,7 @@ export class ChatProvider {
const country = user.regUser.flag || 'xx'; const country = user.regUser.flag || 'xx';
let displayCountry = country; let displayCountry = country;
if (user.userlvl !== 0) { if (user.userlvl !== 0) {
displayCountry = 'fa'; displayCountry = 'zz';
} else if (name.endsWith('berg') || name.endsWith('stein')) { } else if (name.endsWith('berg') || name.endsWith('stein')) {
displayCountry = 'il'; displayCountry = 'il';
} else if (user.id === 2927) { } else if (user.id === 2927) {

13
src/styles/default.css
View File

@ -188,7 +188,6 @@ tr:nth-child(even) {
.win-topbar { .win-topbar {
display: flex; display: flex;
height: 24px; height: 24px;
vertical-align: middle;
} }
.win-title { .win-title {
@ -690,16 +689,14 @@ tr:nth-child(even) {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: inline-block; display: inline-block;
max-width: 80px; max-width: 95px;
vertical-align: middle;
overflow: hidden; overflow: hidden;
} }
.mention, .ping { .mention, .ping {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: inline-block; display: inline-block;
max-width: 90px; max-width: 85px;
vertical-align: middle;
overflow: hidden; overflow: hidden;
} }
.chatts { .chatts {
@ -711,7 +708,7 @@ tr:nth-child(even) {
.chatmsg { .chatmsg {
font-size: 13px; font-size: 13px;
user-select: text; user-select: text;
padding: 2px 0 2px 2px; padding: 3px 0 3px 2px;
} }
.chatmsg:hover { .chatmsg:hover {
background-color: #dadada; background-color: #dadada;
@ -724,6 +721,10 @@ tr:nth-child(even) {
overflow-y: clip; overflow-y: clip;
overflow-x: hidden; overflow-x: hidden;
} }
.msg span {
display: inline-block;
vertical-align: middle;
}
.msg.info { .msg.info {
color: #cc0000; color: #cc0000;
} }