diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 64ea09cdc..094a2eb0a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -251,20 +251,24 @@ span.fa-holder { div.accompanyingcourse-resume { div.associated-persons { span.household { + display: inline-block; border-radius: 8px; border: 1px solid $white; &:hover { border: 1px solid $chill-beige; + i { + display: inline-block; + } + } + &.no-household:hover { + border: 1px solid $white; } i { color: $chill-beige; + display: none; } - padding: 0.5em; + padding: 0.3em; margin-right: 2px; - span.badge-person, span.badge-thirdparty { - margin-bottom: 1em; - } - &.no-household {} } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index a879e1ccb..690ef99e3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -25,8 +25,10 @@
{% for h in participationsByHousehold %} - {% set householdClass = (h.household is not null) ? 'household-' ~ h.household.id : 'no-household' %} - + {% set householdClass = (h.household is not null) ? 'household-' ~ h.household.id : 'no-household alert alert-warning' %} + {% set householdTitle = (h.household is not null) ? + 'household.Household number'|trans({'household_num': h.household.id }) : 'household.Never in any household'|trans %} + {% if h.household is not null %}