Merge branch 'mealie-next' into mealie-next

frontend/pages/group/data.vue

@@ -6,7 +6,6 @@
       </template>
       <template #title> {{ $t('data-pages.data-management') }} </template>
       {{ $t('data-pages.data-management-description') }}
-      <BannerExperimental class="mt-5"></BannerExperimental>
       <template #content>
         <div>
           <BaseOverflowButton

frontend/pages/group/data/recipes.vue

@@ -121,7 +121,7 @@
             <template #icon>
               {{ $globals.icons.database }}
             </template>
-            {{ $t('general.import') }}}
+            {{ $t('general.import') }}
           </BaseButton>
           <BaseButton
             color="info"

frontend/pages/group/mealplan/planner.vue

@@ -24,8 +24,8 @@
       </v-date-picker>
     </v-menu>
 
-    <div class="d-flex align-center justify-space-between mb-2">
-      <v-tabs>
+    <div class="d-flex flex-wrap align-center justify-space-between mb-2">
+      <v-tabs style="width: fit-content;">
         <v-tab :to="`/group/mealplan/planner/view`">{{ $t('meal-plan.meal-planner') }}</v-tab>
         <v-tab :to="`/group/mealplan/planner/edit`">{{ $t('general.edit') }}</v-tab>
       </v-tabs>

frontend/pages/group/reports/_id.vue

@@ -21,7 +21,7 @@
           {{ $d(Date.parse(item.timestamp), "short") }}
         </template>
         <template #expanded-item="{ headers, item }">
-          <td class="pa-6" :colspan="headers.length">{{ item.exception }}</td>
+          <td v-if="item.exception" class="pa-6" :colspan="headers.length">{{ item.exception }}</td>
         </template>
       </v-data-table>
     </v-container>