Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

This commit is contained in:
2021-08-20 18:46:43 +02:00
72 changed files with 2630 additions and 666 deletions

View File

@@ -10,7 +10,7 @@
{{ $t('household_number', { number: household.id } ) }}
</div>
<!-- member part -->
<!-- member part -->
<div v-if="hasCurrentMembers" class="members">
<span class="current-members">{{ $t('current_members') }}: </span>
<template v-for="(m, index) in currentMembers()" :key="m.id">
@@ -40,7 +40,7 @@
<style lang="scss">
.chill-entity__household {
display: grid;
grid-template-areas:
grid-template-areas:
"identifier identifier where"
"who who where"
;
@@ -50,7 +50,7 @@
.identifier {
grid-area: identifier;
font-size: 1.3em;
font-weight: 700;
color: var(--chill-blue);
@@ -110,7 +110,7 @@ export default {
return this.household.members.filter(m => this.household.current_members_id.includes(m.id))
.sort((a, b) => {
if (a.position.ordering < b.position.ordering) {
return -1;
return -1;
}
if (a.position.ordering > b.position.ordering) {
return 1;