fix: component colors

Signed-off-by: Mathis Mensing <[email protected]>
fluidd-core · Jul 30, 2023 · 6472589 · 6472589
1 parent 8f650ce
commit 6472589
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -107,7 +107,7 @@
               <td>
                 <div class="d-flex">
                   <v-icon
-                    :color="`#${item.filament.color_hex}`"
+                    :color="`#${item.filament.color_hex ?? ($vuetify.theme.dark ? 'fff' : '000')}`"
                     x-large
                     class="mr-4 flex-column"
                   >

diff --git a/src/components/widgets/spoolman/SpoolmanCard.vue b/src/components/widgets/spoolman/SpoolmanCard.vue
@@ -19,7 +19,7 @@
       v-if="activeSpool && $vuetify.breakpoint.lgAndDown"
       value="100"
       :height="6"
-      :color="`#${activeSpool.filament.color_hex}`"
+      :color="`#${activeSpool.filament.color_hex ?? ($vuetify.theme.dark ? 'fff' : '000')}`"
     />
 
     <v-card-text>
@@ -98,7 +98,7 @@
           class="pa-0"
         >
           <v-icon
-            :color="activeSpool ? `#${activeSpool.filament.color_hex}` : $vuetify.theme.dark ? 'white' : 'black'"
+            :color="`#${activeSpool?.filament.color_hex ?? ($vuetify.theme.dark ? 'fff' : '000')}`"
             :size="activeSpool ? '110px' : '55px'"
           >
             {{ activeSpool ? '$filament' : '$progressQuestion' }}