From a56fb3e7695ccaf2d05ed28647f16788e4778f18 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Thu, 20 Apr 2023 11:54:18 -0400
Subject: [PATCH] wip

---
 src/lib/components/Field.svelte               |  5 ++-
 .../ShipEdit/Propulsion/Engine.svelte         |  8 ++++-
 .../components/ShipEdit/Propulsion/Ftl.svelte |  7 ++--
 .../ShipEdit/Structure/Screens.svelte         |  1 +
 .../ShipEdit/Structure/Streamlining.svelte    | 33 +++++++++----------
 .../ShipEdit/Weaponry/AddWeapon.svelte        |  9 +++--
 .../Weaponry/Weapon/Beam/index.svelte         |  8 +++--
 .../ShipEdit/Weaponry/Weapon/index.svelte     |  2 +-
 src/lib/components/ShipItem.svelte            | 11 +++----
 9 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/lib/components/Field.svelte b/src/lib/components/Field.svelte
index 334bab2..69f0394 100644
--- a/src/lib/components/Field.svelte
+++ b/src/lib/components/Field.svelte
@@ -3,7 +3,7 @@
     <input type="text" bind:value on:change />
   </slot>
   {#if label}
-    <label class:active={!!value}>{label}</label>
+    <label class:active>{label}</label>
   {/if}
 </div>
 
@@ -13,6 +13,9 @@
   export let placeholder = label;
 
   export let suffix = false;
+  export let activeLabel = undefined;
+
+  $: active = typeof activeLabel === "boolean" ? activeLabel : value;
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Propulsion/Engine.svelte b/src/lib/components/ShipEdit/Propulsion/Engine.svelte
index 84d892b..50c903e 100644
--- a/src/lib/components/ShipEdit/Propulsion/Engine.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Engine.svelte
@@ -11,7 +11,10 @@
       />
     </Field>
 
-    <label><input type="checkbox" bind:checked={advanced} /> advanced</label>
+    <label class="checkbox">
+      <input type="checkbox" bind:checked={advanced} />
+      <span>advanced</span>
+    </label>
   </div>
 </ShipItem>
 
@@ -36,4 +39,7 @@
     display: flex;
     align-items: end;
   }
+  label {
+    margin-left: 2em;
+  }
 </style>
diff --git a/src/lib/components/ShipEdit/Propulsion/Ftl.svelte b/src/lib/components/ShipEdit/Propulsion/Ftl.svelte
index a6bbd47..f078dcb 100644
--- a/src/lib/components/ShipEdit/Propulsion/Ftl.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Ftl.svelte
@@ -1,12 +1,13 @@
 <ShipItem {...reqs}>
-  <Field label="FTL drive">
+  <div>FTL drive</div>
+  <nav>
     {#each ftlTypes as t (t)}
       <label
         ><input type="radio" bind:group={type} value={t} />
-        {t}
+        <span>{t}</span>
       </label>
     {/each}
-  </Field>
+  </nav>
 </ShipItem>
 
 <script lang="ts">
diff --git a/src/lib/components/ShipEdit/Structure/Screens.svelte b/src/lib/components/ShipEdit/Structure/Screens.svelte
index 2086575..5e70bb7 100644
--- a/src/lib/components/ShipEdit/Structure/Screens.svelte
+++ b/src/lib/components/ShipEdit/Structure/Screens.svelte
@@ -33,5 +33,6 @@
   div {
     display: flex;
     gap: 2em;
+    align-items: baseline;
   }
 </style>
diff --git a/src/lib/components/ShipEdit/Structure/Streamlining.svelte b/src/lib/components/ShipEdit/Structure/Streamlining.svelte
index 91f017d..7918702 100644
--- a/src/lib/components/ShipEdit/Structure/Streamlining.svelte
+++ b/src/lib/components/ShipEdit/Structure/Streamlining.svelte
@@ -1,20 +1,19 @@
 <ShipItem {...reqs}>
-  <Field label="streamlining">
-    <div>
-      <label>
-        <input type="radio" bind:group={type} value="none" />
-        none</label
-      >
-      <label>
-        <input type="radio" bind:group={type} value="partial" />
-        partial</label
-      >
-      <label>
-        <input type="radio" bind:group={type} value="full" />
-        full</label
-      >
-    </div>
-  </Field>
+  <div>streamlining</div>
+  <div class="field middle-align">
+    <label class="radio">
+      <input type="radio" bind:group={type} value="none" />
+      <span>none</span></label
+    >
+    <label class="radio">
+      <input type="radio" bind:group={type} value="partial" />
+      <span>partial</span></label
+    >
+    <label class="radio">
+      <input type="radio" bind:group={type} value="full" />
+      <span>full</span></label
+    >
+  </div>
 </ShipItem>
 
 <script>
@@ -36,6 +35,6 @@
     display: flex;
   }
   label {
-    margin-left: 1em;
+    margin-left: 2em !important;
   }
 </style>
diff --git a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
index ce30242..a0f09ee 100644
--- a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
@@ -1,12 +1,13 @@
 <div>
-  <Field label="">
+  <button class="button small primary" on:click={addWeapon}>add weapon</button>
+  <Field label="" suffix>
     <select bind:value={type}>
       {#each weaponTypes as weapon (weapon.type)}
         <option value={weapon.type}>{weapon.name}</option>
       {/each}
     </select>
+    <i>arrow_drop_down</i>
   </Field>
-  <button class="button small primary" on:click={addWeapon}>add weapon</button>
 </div>
 
 <script>
@@ -30,6 +31,7 @@
   button {
     width: inherit;
     display: inline-block;
+    margin-right: 2em;
   }
   div :global(.field) {
     display: flex;
@@ -37,7 +39,8 @@
   }
   div {
     display: flex;
-    margin-left: 5em;
+    margin-left: 0em;
     margin-bottom: 2em;
+    align-items: baseline;
   }
 </style>
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
index f2fede6..8296d95 100644
--- a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
@@ -1,20 +1,22 @@
-<label>beam</label>
+<span>beam</span>
 
-<Field label="beam class">
+<Field label="beam class" suffix>
   <select bind:value={weaponClass}>
     <option value={1}>1</option>
     <option value={2}>2</option>
     <option value={3}>3</option>
     <option value={4}>4</option>
   </select>
+  <i>arrow_drop_down</i>
 </Field>
 
-<Field label="arcs">
+<Field label="arcs" suffix>
   <select bind:value={nbrArcs}>
     {#each arc_options[weaponClass] || [] as nbrArcs (nbrArcs)}
       <option>{nbrArcs}</option>
     {/each}
   </select>
+  <i>arrow_drop_down</i>
 </Field>
 
 <Arcs selected={arcs} on:clickArc={({ detail }) => setArcs(detail)} />
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
index adb081d..b8bf316 100644
--- a/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
@@ -1,6 +1,6 @@
 <ShipItem {...reqs}>
   <div class="weapon_row">
-    <button class="button small red remove" on:click={remove}>remove </button>
+    <a on:click={remove}><i>Delete</i> </a>
 
     <svelte:component this={component[type]} {...specs} on:change={update} />
   </div>
diff --git a/src/lib/components/ShipItem.svelte b/src/lib/components/ShipItem.svelte
index 61a2194..00194b5 100644
--- a/src/lib/components/ShipItem.svelte
+++ b/src/lib/components/ShipItem.svelte
@@ -3,9 +3,12 @@
 
   <div class="reqs">
     <div class="mass" bind:this={mass_el}>
-      {mass} <img src="{base}/mass.svg" alt="mass" />
+      {mass} <i>Weight</i>
+    </div>
+    <div class="cost" bind:this={cost_el}>
+      {cost}
+      <i>Paid</i>
     </div>
-    <div class="cost" bind:this={cost_el}>{cost}</div>
   </div>
 </div>
 
@@ -53,10 +56,6 @@
   img {
     width: 0.75em;
   }
-  .cost:after {
-    content: "\00A4";
-    margin-left: 0.5em;
-  }
   .mass img {
     width: 0.75em;
     display: inline-block;