From 4c47105de1b5a12e698f4dd9853d4d46ce216828 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Sun, 1 Aug 2021 13:43:09 +0200 Subject: [PATCH] flex-table column width auto; overwrite for specific use --- .../Resources/public/chill/scss/flex_table.scss | 12 ++++-------- .../Resources/public/chill/chillperson.scss | 8 ++++++++ .../views/AccompanyingCourse/index.html.twig | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 526ad2787..4a569084f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -3,11 +3,13 @@ */ div.flex-bloc, div.flex-table { + margin: 1.5em 0; + h2, h3, h4, dl, p { margin: 0; } h2, h3, h4 { - color: var(--bs-chill-blue); + color: $blue; } div.item-bloc { @include border-collapse; @@ -48,8 +50,6 @@ div.flex-bloc { flex-grow: 1; flex-shrink: 1; flex-basis: auto; display: flex; - .list-content { // ul, dl, or div - } ul.record_actions { margin: 0; align-self: flex-end; @@ -96,15 +96,13 @@ div.flex-table { div.item-col { &:first-child { - flex-grow: 0; flex-shrink: 0; flex-basis: 33%; + flex-grow: 0; flex-shrink: 0; flex-basis: auto; } &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; display: flex; justify-content: flex-end; - .list-content { // ul, dl, or div - } ul.record_actions { margin: 0; align-self: flex-start; @@ -126,8 +124,6 @@ div.flex-table { } } - // neutralize - div.chill_address div.chill_address_address p { text-indent: 0; } } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index dace93340..5beb5249b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -106,6 +106,14 @@ div#header-accompanying_course-details { padding-bottom: 1em; } +// flex-table precision +div.accompanyingcourse-resume { + div.associated-persons { + .flex-table .item-row .item-col:first-child { flex-basis: 33%; } + } +} + + /* * HOUSEHOLD CONTEXT * Header custom for Household diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index bb42a390a..8082a6387 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -36,7 +36,7 @@ {% if participation.enddate is null %}
{{ participation.person|chill_entity_render_box({ - 'render': 'bloc', 'addLink': false, 'addInfo': true, + 'render': 'bloc', 'addLink': false, 'addInfo': true, 'addAltNames': false, 'customButtons': { 'before': _self.button_person(participation.person) } }) }}