mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2025-12-24 02:39:20 -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

14
cookbook/static/themes/tandoor.min.css vendored
View File

@@ -4190,12 +4190,12 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-dark .navbar-toggler {
color: hsla(0, 0%, 18%, .5);
border-color: hsla(0, 0%, 18%, .1)
color: rgba(46, 46, 46, 0.5);
border-color: rgba(46, 46, 46, 0.5);
}
.navbar-dark .navbar-toggler-icon {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(46, 46, 46, 1)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")
}
.navbar-dark .navbar-text {
@@ -4261,7 +4261,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
.card-header {
padding: .75rem 1.25rem;
margin-bottom: 0;
background-color: rgba(0, 0, 0, .03);
background-color: #ffffff;
border-bottom: 1px solid rgba(0, 0, 0, .125)
}
@@ -10427,6 +10427,12 @@ footer a:hover {
padding: 5px 0 20px 39px
}
.modal-content .modal-footer {
border: none;
justify-content: flex-start;
padding: 5px 0 20px 39px
}
/*# sourceMappingURL=maps/style.min.css.map */
.bg-header {

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">

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

@@ -57,8 +57,8 @@
value="1" maxlength="3" min="0"
type="number" class="form-control form-control-lg" v-model.number="servings"/>
</div>
<div class="my-auto">
<b><template v-if="recipe.servings_text === ''">{{ $t('Servings') }}</template><template v-else>{{recipe.servings_text}}</template></b>
<div class="my-auto ">
<span class="text-primary"><b><template v-if="recipe.servings_text === ''">{{ $t('Servings') }}</template><template v-else>{{recipe.servings_text}}</template></b></span>
</div>
</div>
</div>

4
vue/src/components/Keywords.vue
View File

@@ -1,8 +1,8 @@
<template>
<div v-if="recipe.keywords.length > 0">
<small :key="k.id" v-for="k in recipe.keywords" style="padding: 2px">
<span :key="k.id" v-for="k in recipe.keywords" style="padding: 2px">
<b-badge pill variant="light">{{k.label}}</b-badge>
</small>
</span>
</div>
</template>

6
vue/src/locales/nl.json
View File

@@ -49,5 +49,9 @@
"External": "Externe",
"Settings": "Instellingen",
"Meal_Plan": "Maaltijdplan",
"New": "Nieuw"
"New": "Nieuw",
"Supermarket": "Supermarkt",
"Categories": "Categorieën",
"Category": "Categorie",
"Selected": "Geselecteerd"
}