Merge branch 'master' into develop
This commit is contained in:
commit
54fab3d233
2 changed files with 6 additions and 2 deletions
|
@ -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;
|
||||||
|
|
|
@ -1089,6 +1089,10 @@ div.action.danger p.action-body{
|
||||||
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 {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue