Merge remote-tracking branch 'origin/master' into rector/rules-symfony

# Conflicts:
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php

src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss

@@ -207,10 +207,11 @@ div.banner {
             span.badge-member {
                 flex-shrink: 0; flex-grow: 0; flex-basis: auto;
                 color: $white;
+                background-color: transparentize($white, 0.85);
                 border: 1px solid transparentize($white, 0.75);
                 border-bottom: 3px solid transparentize( shade-color( $chill-green, 20%), 0.3);
                 border-radius: 8px;
-                padding: 0.2em 0.7em;
+                padding: 0.0em 0.5em;
                 margin-bottom: 0.2em;
                 margin-right: 0.3em;
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue

@@ -1,7 +1,7 @@
 <template>
   <ckeditor
       name="content"
-      v-bind:placeholder="$t('comment.content')"
+      v-bind:placeholder="$t('household_members_editor.positioning.comment_placeholder')"
       :editor="editor"
       v-model="content"
       tag-name="textarea">

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js

@@ -53,6 +53,7 @@ const appMessages = {
          persons_to_positionnate: 'Usagers à positionner',
          holder: "Titulaire",
          comment: "Commentaire",
+         comment_placeholder: "Associer un commentaire",
        },
       app: {
        next: 'Suivant',