From b301c1d4055f3796fdd3f2661bf28d832e73579e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Sat, 21 Aug 2021 14:54:04 +0200 Subject: [PATCH] flex-table accompanyingcourse-list used in two contexts + wraplist title style --- .../public/chill/scss/flex_table.scss | 4 +--- .../public/chill/scss/flex_table.scss | 22 ++++++++++--------- .../views/AccompanyingPeriod/_list.html.twig | 2 +- .../views/AccompanyingPeriod/list.html.twig | 2 +- 4 files changed, 15 insertions(+), 15 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 cc9dc363d..aab584b63 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -151,7 +151,7 @@ div.wrap-list { flex-shrink: 0; @include media-breakpoint-up(md) { - margin-left: 1.5em; + //margin-left: 1.5em; } & > * { @@ -187,8 +187,6 @@ div.wrap-list { } } - - /* * __WRAP_HEADER_BLOC________ * HEADER ROW FOR FLEX-TABLE ELEMENTS diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss index 19c06df3d..0229f53b1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss @@ -12,16 +12,18 @@ div.accompanyingcourse-resume { } } -/// AccompanyingPeriod list -div.accompanyingcourse-list, div.household-members { - .flex-table .item-bloc .item-row { - &:nth-child(2) { - flex-direction: row; - } - &:last-child { - flex-direction: column; - } +/// AccompanyingPeriod list Page (in person/household context) +div.accompanyingcourse-list { + &.flex-table .item-bloc .item-row { + //&:nth-child(2) { flex-direction: row; } + //&:last-child { flex-direction: column; } } + div.title h3 { + font-weight: 700; + font-size: 100%; + font-family: 'Open Sans'; + } + div.list {} } /// Search Page (list_with_period.html.twig) @@ -40,7 +42,7 @@ div.list-with-period { &.title { width: 34%; @include media-breakpoint-up(md) { - margin-left: 0; + //margin-left: 0; } } &.list { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 33e969392..16234ea61 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -1,5 +1,5 @@ {% block content %} -
+
{% for accompanying_period in accompanying_periods %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig index e1f82bb64..a95fa800c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig @@ -5,7 +5,7 @@ {% block title %}{{ 'Accompanying period list'|trans }}{% endblock title %} {% block personcontent %} -
+

{{ 'Accompanying period list'|trans }}