FIxed merge conflicts with dev and also did some work on Gang UI

This commit is contained in:
danielyxie
2018-10-10 18:13:31 -05:00
30 changed files with 1439 additions and 1065 deletions
+2 -2
View File
@@ -152,7 +152,7 @@ function addActiveScriptsItem(workerscript) {
panel.appendChild(createElement("br"));
panel.appendChild(createElement("span", {
innerText: "Log",
class: "active-scripts-button",
class: "accordion-button",
margin: "4px",
padding: "4px",
clickListener: () => {
@@ -162,7 +162,7 @@ function addActiveScriptsItem(workerscript) {
}));
panel.appendChild(createElement("span", {
innerText: "Kill Script",
class: "active-scripts-button",
class: "accordion-button",
margin: "4px",
padding: "4px",
clickListener: () => {