Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor improvements #279

Merged
merged 3 commits into from
Dec 26, 2020
Merged

Minor improvements #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7fc15d
Show advanced search again if it was used
aarondoet Dec 22, 2020
bc31f01
Fix 'All Keywords' label in website import
aarondoet Dec 22, 2020
0a40de0
Add min/max to servings spinner
aarondoet Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cookbook/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>

<div class="row">
<div class="collapse col-md-12" id="collapse_adv_search">
<div class="collapse col-md-12{% if filter.data.keywords or filter.data.foods or filter.data.internal and not filter.data.internal == "unknown" %} show{% endif %}" id="collapse_adv_search">
<div style="margin-top: 1vh">
{{ filter.form.keywords | as_crispy_field }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion cookbook/templates/recipe_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h4 class="card-title">{% trans 'Ingredients' %}</h4>
<div class="col col-md-3">

<div class="input-group d-print-none">
<input type="number" value="1" maxlength="3" class="form-control"
<input type="number" value="1" min="1" max="999" class="form-control"
v-model="ingredient_factor"/>
<div class="input-group-append">
<span class="input-group-text"><i class="fas fa-calculator"></i></span>
Expand Down
4 changes: 2 additions & 2 deletions cookbook/templates/url_import.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
</div>

<div class="form-group">
<label for="id_all_keywords">{% trans 'All Keywords' %}</label><br/>
{% trans 'All Keywords' %}<br/>
<input id="id_all_keywords" type="checkbox"
v-model="all_keywords"> {% trans 'Import all Keywords not only the ones already existing.' %}
v-model="all_keywords"> <label for="id_all_keywords">{% trans 'Import all Keywords not only the ones already existing.' %}</label>
</div>

<div class="form-group">
Expand Down