Merge branch 'vertical-rythm-editor'

NOTES

@@ -0,0 +1,2 @@
+vertical rythm: 16px = 1rem
+                24px = 1.5rem <== ?

src/lib/components/MainLayout.svelte

@@ -43,6 +43,9 @@
 </script>
 
 <style>
+  h1 {
+    line-height: calc(3 * var(--vertical-rythm));
+  }
   header nav {
     align-items: baseline;
     font-family: "Faktos";

src/lib/components/Section.svelte

@@ -15,12 +15,14 @@
     grid-column: 1 / span 3 !important;
     align-items: baseline;
     gap: 1em;
-    margin-bottom: 1em;
+    margin-bottom: 1rem;
     background-color: var(--primary-background);
   }
   h2 {
     font-weight: bold;
     font-size: var(--font-scale-12);
+    margin: 0px;
+    height: 2rem;
   }
   hr {
     flex: 1;

src/lib/components/ShipEdit/Identification.svelte

@@ -57,6 +57,8 @@
   .identification-row {
     display: flex;
     align-items: start;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
   }
   select {
     min-width: 10em;

src/lib/components/ShipEdit/Structure/Streamlining.svelte

@@ -37,4 +37,7 @@
   label {
     margin-left: 2em !important;
   }
+  div.field {
+    margin-bottom: 0px;
+  }
 </style>

src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.svelte

@@ -7,7 +7,7 @@
       on:click={() => clickArc(arc)}
     />
   {/each}
-  <circle cx="50%" cy="50%" r={size / 3} />
+  <circle cx="50%" cy="50%" r={inner} />
   <slot />
 </svg>
 
@@ -19,6 +19,7 @@
 
   export let selected = [];
   export let size = 60;
+  export let inner = size / 3;
 
   const dispatch = createEventDispatcher();
 

src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte

@@ -19,7 +19,13 @@
   <i>arrow_drop_down</i>
 </Field>
 
-<Arcs selected={arcs} on:clickArc={({ detail }) => setArcs(detail)} />
+<div class="arcs">
+  <Arcs
+    size={48}
+    selected={arcs}
+    on:clickArc={({ detail }) => setArcs(detail)}
+  />
+</div>
 
 <script>
   import { getContext } from "svelte";
@@ -93,3 +99,9 @@
 
   $: memoChange(weaponClass, ...arcs);
 </script>
+
+<style>
+  .arcs {
+    margin-top: 0.5rem;
+  }
+</style>

src/lib/style/index.css

@@ -1,20 +1,25 @@
 @import "/fonts/faktos.css";
 @import "/fonts/dosis/dosis.css";
 
-  @font-face {
+@font-face {
   font-family: "Faktos";
   font-style: normal;
   src: url(/fonts/Faktos.ttf) format("truetype");
-  }
+}
-  @font-face {
+@font-face {
   font-family: "Dosis";
   src: url(/fonts/dosis/Dosis-VariableFont_wght.ttf) format("truetype");
-  }
+}
 
 :root {
-  --font: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  --font: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-  --main-font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-    --font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI",
+  --main-font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI",
+    Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  --font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI";
+
+  --vertical-rythm: 1.5rem;
+  /* == 24px */
 
   --font-scale-9: 0.75rem;
   --font-scale-10: 1rem;
@@ -37,8 +42,7 @@ input.short {
   width: 5em !important;
 }
 
-
+body {
-  body {
   position: relative;
   width: 100%;
   height: 100%;
@@ -47,23 +51,30 @@ input.short {
   margin: 0;
   padding: 8px;
   box-sizing: border-box;
-  }
+}
 
-  a {
+a {
   color: rgb(0, 100, 200);
   text-decoration: none;
-  }
+}
 
-  a:hover {
+a:hover {
   text-decoration: underline;
-  }
+}
 
-  a:visited {
+a:visited {
   color: rgb(0, 80, 160);
-  }
+}
 
-
+h1 {
-h1 { font-size: var(--font-scale-15); }
+  font-size: var(--font-scale-15);
-h2 { font-size: var(--font-scale-14); }
+}
-h3 { font-size: var(--font-scale-13); }
+h2 {
-h4 { font-size: var(--font-scale-12); }
+  font-size: var(--font-scale-14);
+}
+h3 {
+  font-size: var(--font-scale-13);
+}
+h4 {
+  font-size: var(--font-scale-12);
+}

src/routes/export/print/PrintShip/Weapons/Beam.svelte

@@ -13,6 +13,9 @@
 </script>
 
 <style>
+  div {
+    margin: 0px 0.5rem;
+  }
   div :global(path:hover) {
     fill: white;
   }