diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index ebcb04f11..6b54172c7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -19,6 +19,7 @@ $chill-theme-buttons: (
"view": $chill-blue,
"misc": $gray-300,
"cancel": $gray-300,
+ "choose": $gray-300
);
@each $button, $color in $chill-theme-buttons {
@@ -68,6 +69,7 @@ $chill-theme-buttons: (
// &.btn-action::before,
&.btn-delete::before,
&.btn-remove::before,
+ &.btn-choose::before,
&.btn-cancel::before {
font: normal normal normal 14px/1 ForkAwesome;
margin-right: 0.5em;
@@ -91,6 +93,7 @@ $chill-theme-buttons: (
&.btn-delete::before { content: "\f1f8"; } // fa-trash
&.btn-remove::before { content: "\f00d"; } // fa-times
&.btn-cancel::before { content: "\f060"; } // fa-arrow-left
+ &.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 729ad06c7..cf6d8adeb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -110,7 +110,7 @@
-
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 6be5392ce..794d664ca 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -37,7 +37,7 @@ const appMessages = {
hide_household_suggestion: "Masquer les suggestions",
show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
- select_household: "Choisir ce ménage",
+ select_household: "Sélectionner",
dates_title: "Période de validité",
dates: {
start_date: "Début de validité",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 5851a0230..694dc8440 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -15,11 +15,10 @@
-
+
- -
-
+
-
- -
-
+
-
{{ $t('no_members_yet') }}
-
-
-
-
{{ $t('no_current_address') }}
@@ -121,32 +117,10 @@ export default {
section.chill-entity {
&.entity-household {
- .fa-hop::marker {
- content: '::';
+ ul.list-content li::marker {
+ content: '';
}
- /*
- .identifier {
- //grid-area: iden;
- font-size: 1.3em;
- font-weight: 700;
- color: var(--chill-blue);
- }
- display: grid;
- grid-template-columns: auto auto 30%;
- grid-template-areas:
- "iden iden where"
- "who who where";
- .members {
- //grid-area: who;
- .current-members {
- font-weight: 700;
- }
- }
- .where {
- //grid-area: where
- }
- */
}
}