Merge branch 'bootstrap5_replacing_scratch_mat' into bootstrap5_replacing_scratch

This commit is contained in:
2021-07-06 13:50:17 +02:00
166 changed files with 693 additions and 537 deletions

View File

@@ -34,7 +34,7 @@
<ul class="record_actions">
<li>
<button type="submit" class="sc-button bt-save">
<button type="submit" class="btn btn-save">
{{ 'Save'|trans }}
</button>
</li>
@@ -63,7 +63,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
>
{{ 'household.Comment and expecting birth'|trans }}
</a>
@@ -110,7 +110,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
/>
{{ 'household.Update membership'|trans }}
</a>
@@ -123,7 +123,7 @@
'persons': [ m.person.id ],
'household': household.id
} ) }}"
class="sc-button"
class="btn"
/>
<i class="fa fa-arrows-h"></i>
{{ 'household.Change position'|trans }}
@@ -137,7 +137,7 @@
'persons': [ m.person.id ],
'allow_leave_without_household': true
} ) }}"
class="sc-button"
class="btn"
/>
<i class="fa fa-sign-out"></i>
{{ 'household.Leave'|trans }}
@@ -163,7 +163,7 @@
{% set members = household.nonCurrentMembersByPosition(p) %}
{% if members|length > 0 %}
<p><!-- force a space after table --></p>
<button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
<button class="btn btn-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
</button>
@@ -196,7 +196,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
/>
{{ 'household.Update membership'|trans }}
</a>
@@ -223,7 +223,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
class="sc-button bt-create">
class="btn btn-create">
{{ 'household.Add a member'|trans }}
</a>
</li>