From 73be817c10f097d62c4525b38523e42304c3bff6 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 16 Feb 2023 21:30:30 +0100
Subject: [PATCH] moved context menu and re added descripotion to detailed view

---
 vue/src/components/RecipeCard.vue        | 28 +++++++++++++-----------
 vue/src/components/RecipeContextMenu.vue |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/vue/src/components/RecipeCard.vue b/vue/src/components/RecipeCard.vue
index 260fb1ca8..844fb0a24 100755
--- a/vue/src/components/RecipeCard.vue
+++ b/vue/src/components/RecipeCard.vue
@@ -33,14 +33,6 @@
                             </p>
                         </div>
 
-                        <div class="card-img-overlay h-100 d-flex flex-column justify-content-right float-right text-right pt-2 pr-1"
-                             v-if="show_context_menu">
-                            <a>
-                                <recipe-context-menu :recipe="recipe" class="float-right"
-                                                     :disabled_options="context_disabled_options"
-                                                     v-if="recipe !== null"></recipe-context-menu>
-                            </a>
-                        </div>
                         <div class="card-img-overlay d-flex flex-column justify-content-left float-left text-left pt-2" style="width:40%"
                              v-if="recipe.working_time !== 0 || recipe.waiting_time !== 0">
                             <b-badge pill variant="light" class="mt-1 font-weight-normal" v-if="recipe.working_time !== 0">
@@ -56,16 +48,26 @@
                 </a>
 
                 <b-card-body class="p-2 pl-3 pr-3">
-                    <span>
-                        <a :href="this.recipe.id !== undefined ? resolveDjangoUrl('view_recipe', this.recipe.id) : null" class="text-body font-weight-bold two-row-text">
+                    <div class="d-flex flex-row">
+                        <div class="flex-grow-1">
+                            <a :href="this.recipe.id !== undefined ? resolveDjangoUrl('view_recipe', this.recipe.id) : null" class="text-body font-weight-bold two-row-text">
                             <template v-if="recipe !== null">{{ recipe.name }}</template>
                             <template v-else>{{ meal_plan.title }}</template>
                         </a>
-                    </span>
+                        </div>
+                        <div class="justify-content-end">
+                            <recipe-context-menu :recipe="recipe" class="justify-content-end float-right align-items-end pr-0"
+                                                     :disabled_options="context_disabled_options"
+                                                     v-if="recipe !== null"></recipe-context-menu>
+                        </div>
+                    </div>
+
 
                     <b-card-text style="text-overflow: ellipsis">
                         <template v-if="recipe !== null">
-
+                            <div v-if="show_detail">
+                                {{ recipe.description }}
+                            </div>
 
                             <p class="mt-1 mb-1">
                                 <last-cooked :recipe="recipe"></last-cooked>
@@ -218,7 +220,7 @@ export default {
     position: relative;
 
     margin: auto;
-    overflow: hidden;
+    overflow: visible;
 }
 
 .content .content-overlay {
diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue
index cd0d098a2..c57d64b5d 100644
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -1,12 +1,12 @@
 <template>
     <div>
         <div class="dropdown d-print-none">
-            <a class="btn shadow-none" href="javascript:void(0);" role="button" id="dropdownMenuLink"
+            <a class="btn shadow-none pr-0 pl-0" href="javascript:void(0);" role="button" id="dropdownMenuLink"
                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <i class="fas fa-ellipsis-v fa-lg"></i>
             </a>
 
-            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink" >
                 <a class="dropdown-item" :href="resolveDjangoUrl('edit_recipe', recipe.id)" v-if="!disabled_options.edit"><i
                     class="fas fa-pencil-alt fa-fw"></i> {{ $t("Edit") }}</a>