Merge pull request #67 from Jalle19/fixes

Revert "Add space between numbers and units of measurement"
Jalle19 · Aug 1, 2024 · 6e8fa2b · 6e8fa2b
2 parents ed4cd69 + 87cb6b7
commit 6e8fa2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/webif/src/routes/Characteristics.svelte b/webif/src/routes/Characteristics.svelte
@@ -17,8 +17,8 @@
       <tr>
         <td>{data.characteristics.name}</td>
         <td>{data.characteristics.phase}</td>
-        <td class="cell-right-align">{data.voltage} V</td>
-        <td class="cell-right-align">{data.frequency} Hz</td>
+        <td class="cell-right-align">{data.voltage}V</td>
+        <td class="cell-right-align">{data.frequency}Hz</td>
       </tr>
     {/each}
   </tbody>

diff --git a/webif/src/routes/Circuits.svelte b/webif/src/routes/Circuits.svelte
@@ -33,14 +33,14 @@
         <td>{data.circuit.sensor.type}</td>
         <td class="cell-right-align">
           {#if data.power !== undefined}
-            {data.power} W
+            {data.power}W
           {:else}
             <img src={warning} alt="Warning" /> N/A
           {/if}
         </td>
         <td class="cell-right-align">
           {#if data.apparentPower }
-            {data.apparentPower} VA
+            {data.apparentPower}VA
           {/if}
         </td>
         <td class="cell-right-align">

diff --git a/webif/src/routes/MainsPower.svelte b/webif/src/routes/MainsPower.svelte
@@ -7,9 +7,9 @@
   {#each $mainSensorDataStore as data}
     <div class="mains-power-card">
       <h4>{data.circuit.name}</h4>
-      <span>{data.power} W</span>
+      <span>{data.power}W</span>
       {#if data.apparentPower }
-        <span>{data.apparentPower} VA</span>
+        <span>{data.apparentPower}VA</span>
       {/if}
       {#if data.powerFactor }
         <span>pf {formatPf(data.powerFactor)}</span>