Merge branch 'master' into production
This commit is contained in:
commit
ba3adfead6
|
@ -848,16 +848,18 @@ export function hideAllWindowTypes(
|
|||
}
|
||||
|
||||
export function openChatWindow() {
|
||||
const width = 350;
|
||||
const height = 350;
|
||||
return openWindow(
|
||||
'CHAT',
|
||||
'',
|
||||
false,
|
||||
true,
|
||||
{ chatChannel: 1, inputMessage: '' },
|
||||
window.innerWidth - 350 - 62,
|
||||
window.innerHeight - 220 - 64,
|
||||
350,
|
||||
220,
|
||||
window.innerWidth - width - 62,
|
||||
window.innerHeight - height - 64,
|
||||
width,
|
||||
height,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -119,8 +119,6 @@ export default class MString {
|
|||
const chr = this.txt[yEnd];
|
||||
if (yEnd >= this.txt.length
|
||||
|| chr === '\n'
|
||||
|| chr === '['
|
||||
|| chr === '('
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -680,7 +680,7 @@ tr:nth-child(even) {
|
|||
.chatmsg {
|
||||
font-size: 13px;
|
||||
user-select: text;
|
||||
margin: 0;
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
.chatmsg:hover {
|
||||
background-color: #ececec;
|
||||
|
|
Loading…
Reference in New Issue
Block a user