Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler 2021-08-24 11:50:11 +02:00
commit f0a60d3907
2 changed files with 6 additions and 3 deletions

View File

@ -25,7 +25,7 @@ export class HtmlUtils {
}
public static escapeHtml(html: string): string {
const text = document.createTextNode(html.replace(/(\r\n|\r|\n)/g, "<br/>"));
const text = document.createTextNode(html);
const p = document.createElement("p");
p.appendChild(text);
return p.innerHTML;

View File

@ -1041,11 +1041,14 @@ div.action.danger p.action-body {
text-align: left;
color: white;
}
.popUpElement div {
.popUpElement div{
font-family: 'Press Start 2P';
font-size: 10px;
background-color: #727678;
white-space: pre-line;
}
.popUpElement .nes-container{
padding: 1rem 1rem;
}
.popUpElement button {