mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed recipe image size with nutrition information

Browse Source
This commit is contained in:
vabene1111
2022-11-09 13:23:43 +01:00
parent b489a2d849
commit 5e4cac52d6
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vue/src/apps/RecipeView/RecipeView.vue
View File

@@ -75,7 +75,8 @@
</div> </div>
<div class="col col-md-2 col-2 mt-2 mt-md-0 text-right"> <div class="col col-md-2 col-2 mt-2 mt-md-0 text-right">
<recipe-context-menu v-bind:recipe="recipe" :servings="servings" :disabled_options="{print:false}"></recipe-context-menu> <recipe-context-menu v-bind:recipe="recipe" :servings="servings"
:disabled_options="{print:false}"></recipe-context-menu>
</div> </div>
</div> </div>
<hr/> <hr/>
@@ -103,13 +104,6 @@
:style="{ 'max-height': ingredient_height }"/> :style="{ 'max-height': ingredient_height }"/>
</div> </div>
</div> </div>
<div class="row" style="margin-top: 2vh; margin-bottom: 2vh">
<div class="col-12">
<Nutrition-component :recipe="recipe" id="nutrition_container"
:ingredient_factor="ingredient_factor"></Nutrition-component>
</div>
</div>
</div> </div>
</div> </div>
@@ -137,10 +131,19 @@
<div v-if="recipe.source_url !== null"> <div v-if="recipe.source_url !== null">
<h6 class="d-print-none"><i class="fas fa-file-import"></i> {{ $t("Imported_From") }}</h6> <h6 class="d-print-none"><i class="fas fa-file-import"></i> {{ $t("Imported_From") }}</h6>
<span class="text-muted mt-1"><a style="overflow-wrap: break-word;" :href="recipe.source_url">{{ recipe.source_url }}</a></span> <span class="text-muted mt-1"><a style="overflow-wrap: break-word;"
:href="recipe.source_url">{{ recipe.source_url }}</a></span>
</div>
<div class="row" style="margin-top: 2vh; ">
<div class="col-lg-6 offset-lg-3 col-12">
<Nutrition-component :recipe="recipe" id="nutrition_container"
:ingredient_factor="ingredient_factor"></Nutrition-component>
</div>
</div> </div>
</div> </div>
<add-recipe-to-book :recipe="recipe"></add-recipe-to-book> <add-recipe-to-book :recipe="recipe"></add-recipe-to-book>
<div class="row text-center d-print-none" style="margin-top: 3vh; margin-bottom: 3vh" <div class="row text-center d-print-none" style="margin-top: 3vh; margin-bottom: 3vh"
@@ -206,10 +209,12 @@ export default {
ingredient_count() { ingredient_count() {
return this.recipe?.steps.map((x) => x.ingredients).flat().length return this.recipe?.steps.map((x) => x.ingredients).flat().length
}, },
working_time: function() { working_time: function () {
return calculateHourMinuteSplit(this.recipe.working_time)}, return calculateHourMinuteSplit(this.recipe.working_time)
waiting_time: function() { },
return calculateHourMinuteSplit(this.recipe.waiting_time)}, waiting_time: function () {
return calculateHourMinuteSplit(this.recipe.waiting_time)
},
}, },
data() { data() {
return { return {