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

Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

Browse Source 
# Conflicts:
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	vue/webpack-stats.json
This commit is contained in:
vabene1111
2021-06-08 13:12:22 +02:00
parent 3aade540c1 74f155b6f5
commit 5b79db0725
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/templates/recipes_table.html
View File

@@ -45,7 +45,7 @@
<span class="badge badge-pill badge-light">{{ x }}</span>
{% endfor %}
</p>
<p class="card-text"><small class="text-muted">
<p class="card-text">
{% if row.cells.working_time != 0 %}
<span class="badge badge-secondary"><i
class="fas fa-user-clock"></i> {% trans 'Preparation time ca.' %} {{ row.cells.working_time }} min </span>
@@ -63,7 +63,7 @@
{% if last_cooked %}
<span class="badge badge-primary">{% trans 'Last cooked' %} {{ last_cooked|date }}</span>
{% endif %}
</small></p>
</p>
</div>
<div>
<div class="dropdown">