_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Gregoire Parant 2021-08-24 10:45:03 +02:00
commit 54fab3d233
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/WebRtc/HtmlUtils.ts
View File

@ -25,7 +25,7 @@ export class HtmlUtils {
} }
public static escapeHtml(html: string): string { 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"); const p = document.createElement("p");
p.appendChild(text); p.appendChild(text);
return p.innerHTML; return p.innerHTML;

6
front/style/style.scss
View File

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