From 8a96da09e6a894670362dfb5e0b261974e1a78ac Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Tue, 7 Apr 2020 14:47:45 -0400
Subject: [PATCH] Put the spawners back in the menubar

---
 macrovision.css  | 23 ++++++++++++++++-------
 macrovision.html | 17 +++--------------
 macrovision.js   |  9 +++++----
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/macrovision.css b/macrovision.css
index 1bfa8987..7def5a1c 100644
--- a/macrovision.css
+++ b/macrovision.css
@@ -246,6 +246,12 @@ body.show-extra-options .options-block.options-block-optional {
 }
 
 .menubar-group {
+    margin: 20px;
+    display: flex;
+    flex-direction: row;
+}
+
+.popout-group {
     margin: 20px;
     display: flex;
     flex-direction: column;
@@ -634,23 +640,26 @@ i.far {
     font-size: 200%;
 }
 
-#spawners-entities > select,
-#spawners-entities > button {
+#spawners > select,
+#spawners > button {
     display: none;
 }
 
-#spawners-entities > select.category-visible,
-#spawners-entities > select.category-visible + button {
+#spawners > select#category-picker {
+    display: block;
+}
+
+#spawners > select.category-visible,
+#spawners > select.category-visible + button {
     display: block;
 }
 
-#spawners-entities > select {
+#spawners > select {
     font-size: 24pt;
 }
 
-#spawners-entities > button {
+#spawners > button {
     font-size: 40pt;
-    margin: 10px;
 }
 
 #spawners-categories {
diff --git a/macrovision.html b/macrovision.html
index 58c34abf..73247398 100644
--- a/macrovision.html
+++ b/macrovision.html
@@ -67,6 +67,9 @@
     <button id="toggle-menu">
       <i class="fas fa-bars"></i>
     </button>
+    <span class="menubar-group" id="spawners">
+
+    </span>
     <span class="menubar-group" id="scenes">
       <button id="load-scene">
         <i class="fas fa-cloud-upload-alt"></i>
@@ -86,20 +89,6 @@
   <div id="main-area">
     <div id="options" class="">
       <a href="https://docs.google.com/forms/d/e/1FAIpQLScRC-okDZ3FtzDTkbqSrpj5_OGD-1Vl-VYizOK3QM6quus11g/viewform?usp=sf_link" class="options-banner">Submit your<br>character!</a>
-      <h3 class="options-header">Create</h3>
-      <div class="options-label">
-        Category
-      </div>
-      <div class="options-row full">
-        <select class="options-field-picker" id="spawners-categories">
-
-        </select>
-      </div>
-      <div class="options-label">
-        Entity
-      </div>
-      <div class="options-row full" id="spawners-entities">
-      </div>
       <h3 class="options-header">World Info</h3>
       <span id="options-world">
         <div class="options-label">
diff --git a/macrovision.js b/macrovision.js
index ec882204..94891d44 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -1230,7 +1230,7 @@ function prepareMenu() {
         ]
     ].forEach(group => {
         const span = document.createElement("span");
-        span.classList.add("menubar-group");
+        span.classList.add("popout-group");
         group.forEach(entry => {
             const buttonHolder = document.createElement("div");
             const button = document.createElement("button");
@@ -1860,14 +1860,15 @@ function prepareEntities() {
     availableEntities["characters"].sort((x, y) => {
         return x.name.toLowerCase() < y.name.toLowerCase() ? -1 : 1
     });
-    const holder = document.querySelector("#spawners-entities");
+    const holder = document.querySelector("#spawners");
+    const categorySelect = document.createElement("select");
+    categorySelect.id = "category-picker";
 
-    const categorySelect = document.querySelector("#spawners-categories");
+    holder.appendChild(categorySelect);
 
     Object.entries(availableEntities).forEach(([category, entityList]) => {
         const select = document.createElement("select");
         select.id = "create-entity-" + category;
-        select.classList.add("options-field-picker");
         for (let i = 0; i < entityList.length; i++) {
             const entity = entityList[i];
             const option = document.createElement("option");