From eaff34a3defceedf92f341fdbce396e2eb692fb5 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 28 Jan 2024 16:33:54 +0100 Subject: [PATCH 1/3] fixed meal plan content shift --- vue/src/apps/MealPlanView/MealPlanView.vue | 115 ++++++++++----------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue index 9beb8454..58793c70 100644 --- a/vue/src/apps/MealPlanView/MealPlanView.vue +++ b/vue/src/apps/MealPlanView/MealPlanView.vue @@ -80,80 +80,73 @@ -
+
-
-
-
-
-
- - - - - - - - - - - - +
+
+ + + + + + + + + + + + +
+
+
+
+ + +
+
{{ day.date_label }}
+ +
+ +
-
-
-
- - -
-
{{ day.date_label }}
-
- -
-
- - - -
-
- - -
-
+ + +
+
+ + +
+
{{ plan.entry.recipe.name }} {{ plan.entry.title }}
- + {{ plan.entry.note }}
- - - {{ plan.entry.meal_type_name }} - + + + {{ plan.entry.meal_type_name }} + - {{ plan.entry.recipe.working_time + plan.entry.recipe.waiting_time }} {{ $t('min') }} - -
-
- -
-
- - - + +
+
+ +
-
+ -
+
From 1f5b5df6a5b4a4f6b8d7e78067670f75f4ba24e2 Mon Sep 17 00:00:00 2001 From: Benedikt Weinheimer Date: Sat, 27 Jan 2024 17:09:32 +0000 Subject: [PATCH 2/3] Translated using Weblate (German) Currently translated at 100.0% (554 of 554 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/ --- vue/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/locales/de.json b/vue/src/locales/de.json index c2f3df5b..95b0ad67 100644 --- a/vue/src/locales/de.json +++ b/vue/src/locales/de.json @@ -536,7 +536,7 @@ "Unit_Replace": "Einheit Ersetzen", "quart": "\"Quart\" [qt] (US, Volumen)", "imperial_quart": "Engl. \"Quart\" [imp qt] (UK, Volumen)", - "err_importing_recipe": "Beim Importieren des Rezeptes ist ein Fehler aufgetreten!", + "err_importing_recipe": "Es trat ein Fehler auf beim importieren des Rezepts!", "property_type_fdc_hint": "Nur Nährwerte mit einer FDC ID können automatisch Daten aus der FDC Datenbank beziehen", "Property_Editor": "Nährwerte bearbeiten", "CustomTheme": "Benutzerdefiniertes Theme", From f54a6480f754a740c90caea04d6968e5d3bae9d9 Mon Sep 17 00:00:00 2001 From: tomtjes Date: Sun, 28 Jan 2024 13:20:00 -0500 Subject: [PATCH 3/3] fix description scroll --- vue/src/components/RecipeCard.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/vue/src/components/RecipeCard.vue b/vue/src/components/RecipeCard.vue index c51f4dfc..068601aa 100755 --- a/vue/src/components/RecipeCard.vue +++ b/vue/src/components/RecipeCard.vue @@ -257,6 +257,7 @@ export default { width: 100%; max-height: 100%; overflow-y: scroll; + z-index: 1; top: 50%; left: 50%; opacity: 0;