Merge pull request #291 from Pax1601/main

Minor fixes (merging from main)

client/public/stylesheets/olympus.css

@@ -165,7 +165,7 @@ form>div {
     align-items: center;
     background-color: var(--background-grey);
     border-radius: var(--border-radius-sm);
-    height: 32px;
+    height: 40px;
     overflow: hidden;
     padding-left: 20px;
     padding-right: 30px;
@@ -225,7 +225,7 @@ form>div {
     box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25);
     display: flex;
     justify-content: left;
-    padding: 2px 10px;
+    padding: 2px 15px;
     width: 100%;
 }
 
@@ -251,8 +251,9 @@ form>div {
     border-radius: var(--border-radius-sm);
     color: white;
     display: block;
-    font-size: 12px;
+    font-size: 13px;
     font-weight: normal;
+    height: 32px;
     padding: 6px 2px;
     padding: 5px;
     text-align: left;

client/src/controls/dropdown.ts

@@ -33,8 +33,8 @@ export class Dropdown {
         this.#options.classList.add("ol-scrollable");
     }
 
-    setOptions(optionsList: string[]) {
-        this.#optionsList = optionsList;
+    setOptions(optionsList: string[], sortAlphabetically: boolean = true) {
+        this.#optionsList = optionsList.sort();
         this.#options.replaceChildren(...optionsList.map((option: string, idx: number) => {
             var div = document.createElement("div");
             var button = document.createElement("button");
@@ -70,6 +70,7 @@ export class Dropdown {
             var el = document.createElement("div");
             el.classList.add("ol-ellipsed");
             el.innerText = option;
+            this.#value.replaceChildren();
             this.#value.appendChild(el);
             this.#index = idx;
             this.#close();

client/src/controls/mapcontextmenu.ts

@@ -188,8 +188,6 @@ export class MapContextMenu extends ContextMenu {
         this.#resetGroundUnitType();
 
         const types = groundUnitsDatabase.getByRole(role).map((blueprint) => { return blueprint.label });
-        types.sort();
-
         this.#groundUnitTypeDropdown.setOptions(types);
         this.#groundUnitTypeDropdown.selectValue(0);
         this.clip();
@@ -202,8 +200,6 @@ export class MapContextMenu extends ContextMenu {
         this.#groundUnitTypeDropdown.reset();
 
         const roles = groundUnitsDatabase.getRoles();
-        roles.sort();
-
         this.#groundUnitRoleDropdown.setOptions(roles);
         this.clip();
     }

client/src/panels/logpanel.ts

@@ -18,7 +18,7 @@ export class LogPanel extends Panel
             if (parseInt(idx) >= this.#logs.length) {
                 this.#logs.push(logs[idx]);
                 var el = document.createElement("div");
-                el.innerHTML = logs[idx];
+                el.innerText = logs[idx];
                 el.classList.add("js-log-element", "ol-log-element");
                 this.getElement().appendChild(el);
                 this.getElement().scrollTop = this.getElement().scrollHeight;

client/views/atc/addflight.ejs

@@ -1,5 +1,5 @@
 <form class="ol-strip-board-add-flight">
     <div class="ol-auto-suggest"></div>
     <input type="text" name="unitName" placeholder="Flight search" />
-    <button class="add-flight-by-click" title="Add unit via click"><img src="/images/icons/bullseye-solid.svg" /></button>
+    <button class="add-flight-by-click" title="Add unit via click"><img src="/resources/theme/images/icons/bullseye-solid.svg" /></button>
 </form>