Merge branch 'master' into develop

front/src/WebRtc/HtmlUtils.ts

@@ -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;

front/style/style.scss

@@ -1085,10 +1085,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 {