From 4c3c67344a07a1e702d40757a492c96b7f736de1 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 21 Jun 2021 13:43:15 +0200 Subject: [PATCH 01/29] fix merge old css styles --- .../Resources/public/scss/chillmain.scss | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 1d0ad253f..74080e392 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -112,20 +112,10 @@ div.flex-bloc { flex-grow: 0; flex-shrink: 1; flex-basis: 50%; margin: 0; padding: 1em; - border-top: 0; - &:nth-child(1), &:nth-child(2) { - border-top: 1px solid #000; - } - border-left: 0; - &:nth-child(odd) { - border-left: 1px solid #000; - } - - //background-color: #e6e6e6; display: flex; flex-direction: column; - & > div.item-row { + div.item-row { flex-grow: 1; flex-shrink: 1; flex-basis: auto; display: flex; flex-direction: column; @@ -158,12 +148,6 @@ div.flex-bloc { @media only screen and (max-width: 900px) { flex-direction: column; margin: auto 0; - div.item-bloc { - border-left: 1px solid #000; - &:nth-child(2) { - border-top: 0; - } - } } } @@ -277,5 +261,3 @@ div.address_form { } } } - - From 07ffdfab86e26026f59d14cb65a4a4b3532f9c78 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 21 Jun 2021 15:58:27 +0200 Subject: [PATCH 02/29] household banner context colors --- .../Resources/public/scss/chillmain.scss | 29 --- .../Resources/public/index.js | 2 +- .../Resources/public/sass/chillperson.scss | 218 ++++++++++++++++++ .../Resources/public/sass/person.scss | 168 -------------- .../views/Household/banner.html.twig | 4 +- .../translations/messages+intl-icu.fr.yaml | 3 +- 6 files changed, 222 insertions(+), 202 deletions(-) create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 74080e392..c2d3bd81a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -45,33 +45,6 @@ table { } } -/* - * ACCOMPANYING_COURSE - * Header custom for Accompanying Course - */ - -div#header-accompanying_course-name { - background: none repeat scroll 0 0 #718596; - color: #FFF; - h1 { - margin: 0.4em 0; - } - span { - a { - color: white; - } - a:hover { - text-decoration: underline; - } - } -} -div#header-accompanying_course-details { - background: none repeat scroll 0 0 #718596ab; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; -} - /* * FLEX RESPONSIVE TABLE/BLOCK PRESENTATION */ @@ -216,8 +189,6 @@ div.flex-table { } } - - /* * Address form */ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/index.js b/src/Bundle/ChillPersonBundle/Resources/public/index.js index e3563b4ff..8bc12a497 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/index.js @@ -1,2 +1,2 @@ -require('./sass/person.scss'); +require('./sass/chillperson.scss'); require('./sass/person_with_period.scss'); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss new file mode 100644 index 000000000..4876f248e --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss @@ -0,0 +1,218 @@ +@import '~ChillMainSass/custom/config/colors'; + +/* +* PERSON CONTEXT +*/ + +div#header-person-name { + background: none repeat scroll 0 0 $chill-green-dark; + color: #FFF; + padding-top: 1em; + padding-bottom: 1em; +} + +div#header-person-details { + background: none repeat scroll 0 0 $chill-green; + color: #FFF; + padding-top: 1em; + padding-bottom: 1em; +} + +div#person_details_container { + padding-top: 20px; + padding-bottom: 20px; +} + +div.person-view { + figure.person-details { + h2 { + font-family: 'Open Sans'; + font-weight: 600; + margin-bottom: 0.3em; + font-variant: small-caps; + } + dl { + margin-top: 0.3em; + } + dt { + font-family: 'Open Sans'; + font-weight: 600; + } + dd { + margin-left: 0; + } + /* + a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; } + */ + } + /* custom fields on the home page */ + div.custom-fields { + figure.person-details { + display: flex; + flex-flow: row wrap; + div.cf_title_box:nth-child(4n+1) h2 { + @extend .chill-red; + } + div.cf_title_box:nth-child(4n+2) h2 { + @extend .chill-green; + } + div.cf_title_box:nth-child(4n+3) h2 { + @extend .chill-orange; + } + div.cf_title_box:nth-child(4n+4) h2 { + @extend .chill-blue; + } + div.cf_title_box:nth-child(2n+1) { + width: 50%; + margin-right: 40px; + } + div.cf_title_box:nth-child(2n+2) { + width: calc(50% - 40px); + } + } + } +} + +/* + * ACCOMPANYING_COURSE CONTEXT + * Header custom for Accompanying Course + */ + +div#header-accompanying_course-name { + background: none repeat scroll 0 0 #718596; + color: #FFF; + h1 { + margin: 0.4em 0; + } + span { + a { + color: white; + } + a:hover { + text-decoration: underline; + } + } +} +div#header-accompanying_course-details { + background: none repeat scroll 0 0 #718596ab; + color: #FFF; + padding-top: 1em; + padding-bottom: 1em; +} + +/* + * HOUSEHOLD CONTEXT + * Header custom for Household + */ + +div#header-household-name { + background: none repeat scroll 0 0 #929d69; //#b97a7a; + color: #FFF; + h1 { + margin: 0.4em 0; + } + span { + a { + color: white; + } + a:hover { + text-decoration: underline; + } + } +} +div#header-household-details { + background: none repeat scroll 0 0 #b0b984; //#d29791; + color: #FFF; + padding-top: 1em; + padding-bottom: 1em; + span.current-members-explain { + font-weight: bold; + } +} + +div.household__address, +div.person__address { + div.row { + height: 100px; + width: 100%; + position: relative; + + & > div { + position: absolute; + display: table; + height: 100%; + border: 1px dotted #c3c3c3; + } + + div.household__address--date, + div.person__address--date { + width: 30%; + background-color: #c3c3c3; + height: 100%; + + div.cell { + box-sizing: border-box; + position: relative; + height: 100%; + width: 100%; + margin-left: 50%; + + div.pill { + position: absolute; + box-sizing: border-box; + width: 120px; + height: 40px; + bottom: -20px; + background-color: white; + padding: 10px; + border-radius: 30px; + left: -60px; + text-align: center; + z-index: 10; + } + } + } + + div.household__address--content, + div.person__address--content { + width: 70%; + left: 30%; + text-align: left; + background-color: #ececec; + border: 1px solid #888; + + div.cell { + display: table-cell; + padding: 5px 30px; + vertical-align: middle; + + & > div { + display: flex; + justify-content: space-between; + } + + i.dot::after, + i.dot::before { + position: absolute; + width: 20px; + height: 20px; + content: ''; + border: 0; + background-color: white; + border-radius: 50%; + border: 5px solid #c3c3c3; + z-index: 10; + left: -15px; + bottom: -15px; + } + } + } + } +} + +div.household__address-move { + div.household__address-move__create { + display: flex; + flex-direction: column; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss deleted file mode 100644 index 7ea0d7dfb..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss +++ /dev/null @@ -1,168 +0,0 @@ - -@import '~ChillMainSass/custom/config/colors'; - -div#header-person-name { - background: none repeat scroll 0 0 $chill-green-dark; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; -} - -div#header-person-details { - background: none repeat scroll 0 0 $chill-green; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; -} - -div#person_details_container { - padding-top: 20px; - padding-bottom: 20px; -} - -div.person-view { - figure.person-details { - h2 { - font-family: 'Open Sans'; - font-weight: 600; - margin-bottom: 0.3em; - font-variant: small-caps; - } - - dl { - margin-top: 0.3em; - } - - dt { - font-family: 'Open Sans'; - font-weight: 600; - } - - dd { - margin-left: 0; - } - -// a.sc-button { -/* background-color: $black; - padding-top: 0.2em; - padding-bottom: 0.2em; - }*/ - } - - /* custom fields on the home page */ - div.custom-fields { - figure.person-details { - display: flex; - flex-flow: row wrap; - - div.cf_title_box:nth-child(4n+1) h2 { - @extend .chill-red; - } - - div.cf_title_box:nth-child(4n+2) h2 { - @extend .chill-green; - } - - div.cf_title_box:nth-child(4n+3) h2 { - @extend .chill-orange; - } - - div.cf_title_box:nth-child(4n+4) h2 { - @extend .chill-blue; - } - - div.cf_title_box:nth-child(2n+1){ - width: 50%; - margin-right: 40px; - } - - iv.cf_title_box:nth-child(2n+2) { - width: calc(50% - 40px); - } - - } - - - } - -} - - -/* - * HOUSEHOLD - */ - - -div.household__address, div.person__address { - div.row { - height: 100px; - width: 100%; - position: relative; - & > div { - position: absolute; - display: table; - height: 100%; - border: 1px dotted #c3c3c3; - } - div.household__address--date, div.person__address--date { - width: 30%; - background-color: #c3c3c3; - height: 100%; - div.cell { - box-sizing: border-box; - position: relative; - height: 100%; - width: 100%; - margin-left: 50%; - div.pill { - position: absolute; - box-sizing: border-box; - width: 120px; - height: 40px; - bottom: -20px; - background-color: white; - padding: 10px; - border-radius: 30px; - left: -60px; - text-align: center; - z-index: 10; - } - } - } - div.household__address--content, div.person__address--content { - width: 70%; - left: 30%; - text-align: left; - background-color: #ececec; - border: 1px solid #888; - div.cell { - display: table-cell; - padding: 5px 30px; - vertical-align: middle; - & > div { - display: flex; - justify-content: space-between; - } - i.dot::before, i.dot::after { - position: absolute; - width: 20px; - height: 20px; - content: ''; - border: 0; - background-color: white; - border-radius: 50%; - border: 5px solid #c3c3c3; - z-index: 10; - left: -15px; - bottom: -15px; - } - } - } - } -} -div.household__address-move { - div.household__address-move__create { - display: flex; - flex-direction: column; - } -} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig index 795861529..021bb4571 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig @@ -1,5 +1,5 @@