Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development

helgeerbe · Mar 9, 2023 · a79f7b2 · a79f7b2
2 parents a3f35f2 + 055eb3a
commit a79f7b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -199,6 +199,7 @@ Firmware version seems to play not a significant role and cannot be read from th
 * Prometheus API endpoint (/api/prometheus/metrics)
 * English, german and french web interface
 * Displays (SSD1306, SH1106, PCD8544)
+* Dark Theme
 
 ## Features for developers
 * The microcontroller part

diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue
@@ -94,16 +94,18 @@
                         <div class="card-body">
                             <div class="row flex-row-reverse flex-wrap-reverse g-3">
                                 <template v-for="chanType in [{obj: inverter.INV, name: 'INV'}, {obj: inverter.AC, name: 'AC'}, {obj: inverter.DC, name: 'DC'}].reverse()">
-                                    <div v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel" class="col">
+                                    <template v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel">
                                         <template v-if="(chanType.name != 'DC') ||
                                             (chanType.name == 'DC' && getSumIrridiation(inverter) == 0) ||
                                             (chanType.name == 'DC' && getSumIrridiation(inverter) > 0 && chanType.obj[channel].Irradiation?.v || 0 > 0)
                                             ">
-                                            <InverterChannelInfo :channelData="chanType.obj[channel]"
-                                                :channelType="chanType.name"
-                                                :channelNumber="channel" />
+                                            <div class="col">
+                                                <InverterChannelInfo :channelData="chanType.obj[channel]"
+                                                    :channelType="chanType.name"
+                                                    :channelNumber="channel" />
+                                            </div>
                                         </template>
-                                    </div>
+                                    </template>
                                 </template>
                             </div>
                         </div>