Skip to content

Commit 2a002d0

Browse files
committed
Merge branch '4.0' into 'main'
2 parents 013b779 + 6dba5fe commit 2a002d0

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

phpmyfaq/assets/templates/admin/content/category.add.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
</label>
9999
<div class="col-lg-4">
100100
<select name="group_id" id="group_id" class="form-select">
101+
<option value="0"> - </option>
101102
{{ groupsOptions|raw }}
102103
</select>
103104
</div>

phpmyfaq/assets/templates/admin/content/category.edit.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
</label>
9696
<div class="col-lg-4">
9797
<select name="group_id" id="group_id" class="form-select">
98+
<option value="0"> - </option>
9899
{{ allGroupsOptions | raw }}
99100
</select>
100101
</div>

phpmyfaq/assets/templates/default/startpage.twig

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,24 @@
1111

1212
<!-- Start page -->
1313
{% if startPageCategories %}
14-
<div class="row row-cols-1 row-cols-lg-3 align-items-stretch justify-content-center g-4 py-4 mb-4">
15-
{% for decks in startPageCategoryDecks %}
16-
<div class="col">
17-
<div class="card card-cover h-100 overflow-hidden text-bg-light rounded-3 shadow-lg p-1"
18-
{% if decks['image'] != '' %}
19-
style="background-size: cover; background-repeat: no-repeat; background-position: center center; background-image: url('{{ decks['image'] }}')"
20-
{% endif %}
21-
>
22-
<h3 class="pt-5 mt-5 mb-3 fw-semibold text-center">{{ decks['name'] }}</h3>
23-
<a class="btn btn-primary bg-gradient" href="{{ decks['url'] }}">{{ 'msgGoToCategory' | translate }}</a>
14+
<div class="row row-cols-1 row-cols-lg-3 align-items-stretch justify-content-center g-4 py-4 mb-4">
15+
{% for decks in startPageCategoryDecks %}
16+
<div class="col">
17+
<div class="card card-cover h-100 overflow-hidden text-bg-light rounded-3 shadow-lg p-1"
18+
{% if decks['image'] != '' %}
19+
style="background-size: cover; background-repeat: no-repeat; background-position: center center; background-image: url('{{ decks['image'] }}')"
20+
{% endif %}
21+
>
22+
<div class="d-flex flex-column h-100">
23+
<h3 class="pt-5 mt-5 mb-3 fw-semibold text-center">{{ decks['name'] }}</h3>
24+
<div class="mt-auto px-3 mb-3">
25+
<a class="btn btn-primary bg-gradient w-100" href="{{ decks['url'] }}">{{ 'msgGoToCategory' | translate }}</a>
26+
</div>
27+
</div>
28+
</div>
2429
</div>
25-
</div>
26-
{% endfor %}
27-
</div>
30+
{% endfor %}
31+
</div>
2832
{% endif %}
2933

3034
<!-- Start page content -->

0 commit comments

Comments
 (0)