From cf4165ec96a8b9779a65c2c94804194cff210f09 Mon Sep 17 00:00:00 2001
From: Romein van Buren <romein@vburen.nl>
Date: Mon, 18 Jul 2022 11:40:44 +0200
Subject: [PATCH] Font size setting

---
 gui/dashboard/app.svelte           | 78 ++++++++++++++----------------
 gui/dashboard/lib.js               |  1 +
 gui/dashboard/modal.svelte         |  1 +
 gui/dashboard/settings.svelte      |  9 +++-
 gui/dashboard/tile-rawvalue.svelte |  2 +-
 gui/dashboard/tile.svelte          |  6 +--
 6 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/gui/dashboard/app.svelte b/gui/dashboard/app.svelte
index 5d6664d..0b6c47d 100644
--- a/gui/dashboard/app.svelte
+++ b/gui/dashboard/app.svelte
@@ -111,33 +111,35 @@
 
 <div
   class="center theme-{$settings.theme}"
-  style="--cols: {$settings.cols || 4}; --rows: {$settings.rows || 3};"
+  style="
+    --cols: {$settings.cols || 4};
+    --rows: {$settings.rows || 3};
+    font-size: {$settings.fontSize}rem;
+  "
 >
   <div class="ratio">
-    <div class="content">
-      <div class="tiles">
-        {#each tiles as tile (tile.id)}
-          <div
-            in:receive={{ key: tile.id }}
-            out:send={{ key: tile.id }}
-            animate:flip
-          >
-            <TileRawValue {...tileProps(tile)} />
-          </div>
-        {/each}
-      </div>
+    <div class="tiles">
+      {#each tiles as tile (tile.id)}
+        <div
+          in:receive={{ key: tile.id }}
+          out:send={{ key: tile.id }}
+          animate:flip
+        >
+          <TileRawValue {...tileProps(tile)} />
+        </div>
+      {/each}
+    </div>
 
-      <div class="footer">
-        <div class="time">{time}</div>
-        {#if pageCountFreePlaces > 1}
-          <div class="pagination">
-            {#each Array(pageCountFreePlaces).fill('') as _, i}
-              <em class:active={pageNum === i}></em>
-            {/each}
-          </div>
-        {/if}
-        <Settings />
-      </div>
+    <div class="footer">
+      <div class="time">{time}</div>
+      {#if pageCountFreePlaces > 1}
+        <div class="pagination">
+          {#each Array(pageCountFreePlaces).fill('') as _, i}
+            <em class:active={pageNum === i}></em>
+          {/each}
+        </div>
+      {/if}
+      <Settings />
     </div>
   </div>
 </div>
@@ -154,24 +156,14 @@
   }
 
   .ratio {
-    height: 56.25vw;
+    height: calc(56.25vw - 2rem);
     left: 50%;
-    max-height: 100vh;
-    max-width: 177.77778vh;
+    max-height: calc(100vh - 2rem);
+    max-width: calc(177.77778vh - 2rem);
     position: absolute;
     top: 50%;
     transform: translate(-50%,-50%);
-    width: 100vw;
-    margin: 1rem 0;
-    display: flex;
-    justify-content: center;
-  }
-
-  .content {
-    display: grid;
-    grid-template-rows: 1fr 40px;
-    gap: 0.5rem;
-    width: calc(100% - 2rem);
+    width: calc(100vw - 2rem);
   }
 
   .tiles {
@@ -179,7 +171,9 @@
     grid-template-columns: repeat(var(--cols), 1fr);
     grid-template-rows: repeat(var(--rows), 1fr);
     gap: 1rem;
-    justify-items: stretch;
+    align-items: stretch;
+    justify-content: stretch;
+    height: calc(100% - 50px);
   }
 
   .tiles > * {
@@ -194,13 +188,15 @@
   .footer {
     display: flex;
     justify-content: space-between;
+    height: 50px;
+    font-size: 1.2em;
   }
 
   .pagination em {
     display: inline-block;
     margin-left: 0.5rem;
-    height: 5px;
-    width: 5px;
+    height: 10px;
+    width: 10px;
     border-radius: 5px;
     background-color: #fff;
     opacity: 0.4;
diff --git a/gui/dashboard/lib.js b/gui/dashboard/lib.js
index 0b7d250..3ca09da 100644
--- a/gui/dashboard/lib.js
+++ b/gui/dashboard/lib.js
@@ -7,6 +7,7 @@ function createSettingsStore() {
     theme: 'dark',
     cols: 4,
     rows: 3,
+    fontSize: 1,
   };
 
   const s = writable(defaults);
diff --git a/gui/dashboard/modal.svelte b/gui/dashboard/modal.svelte
index 3e59bf8..d30339e 100644
--- a/gui/dashboard/modal.svelte
+++ b/gui/dashboard/modal.svelte
@@ -50,6 +50,7 @@
     max-width: 500px;
     z-index: 11;
     color: var(--body-fg);
+    font-size: 1.1rem;
   }
 
   .header {
diff --git a/gui/dashboard/settings.svelte b/gui/dashboard/settings.svelte
index 1038f39..a770dfd 100644
--- a/gui/dashboard/settings.svelte
+++ b/gui/dashboard/settings.svelte
@@ -44,12 +44,17 @@
 
   <label>
     Columns
-    <input type="number" bind:value={$settings.cols} width="10">
+    <input type="number" bind:value={$settings.cols} width="10" />
   </label>
 
   <label>
     Rows
-    <input type="number" bind:value={$settings.rows} width="10">
+    <input type="number" bind:value={$settings.rows} width="10" />
+  </label>
+
+  <label>
+    Font size (REMs)
+    <input type="number" bind:value={$settings.fontSize} width="10" step="0.1" />
   </label>
 </Modal>
 
diff --git a/gui/dashboard/tile-rawvalue.svelte b/gui/dashboard/tile-rawvalue.svelte
index 3654f74..1894b3f 100644
--- a/gui/dashboard/tile-rawvalue.svelte
+++ b/gui/dashboard/tile-rawvalue.svelte
@@ -18,7 +18,7 @@
 
 <style>
   .value {
-    font-size: 3vw;
+    font-size: 3em;
     font-weight: 600;
     margin-top: auto;
   }
diff --git a/gui/dashboard/tile.svelte b/gui/dashboard/tile.svelte
index 1932d01..9477c7a 100644
--- a/gui/dashboard/tile.svelte
+++ b/gui/dashboard/tile.svelte
@@ -89,12 +89,12 @@
 
   .desc .title {
     font-weight: 300;
-    font-size: 1.7vw;
+    font-size: 1.3em;
   }
 
   .desc .subtitle {
     font-weight: 300;
-    font-size: 1.5vw;
+    font-size: 1.1em;
     opacity: 0.7;
   }
 
@@ -106,7 +106,7 @@
   .bottom .time {
     margin: auto 0 0 auto;
     opacity: 0.6;
-    font-size: 1.3vw;
+    font-size: 1em;
     text-align: right;
     display: flex;
     align-items: flex-end;