diff --git a/web/themes/custom/reha/dist/css/bundle.css b/web/themes/custom/reha/dist/css/bundle.css index debe4f0..5623341 100644 --- a/web/themes/custom/reha/dist/css/bundle.css +++ b/web/themes/custom/reha/dist/css/bundle.css @@ -1776,10 +1776,10 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .home-page-layout-content .block-block-content3bb825b3-ab84-4861-a4f2-2a5e5eed74de { border: solid #fdc300 1px; background-color: rgb(255, 255, 255); - font-weight: 800; + font-weight: 1000; padding: 2rem; margin-right: 1rem; - width: 20vw; + width: 16vw; margin-left: 15%; padding-top: 0.5rem; padding-left: 0.8rem; @@ -1831,9 +1831,9 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div width: 100%; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .image-site img { - max-height: 500px; + max-height: 600px; width: 100%; - object-fit: cover; + object-fit: contain; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site { background-color: rgb(255, 255, 255); @@ -1855,7 +1855,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div display: none; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site h2 { - order: 2; + order: 3; margin: 0; font-size: 1.8rem; font-weight: 1000; @@ -1866,43 +1866,47 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div line-height: 1.3rem; } } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-numero-site { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row { + order: 1; + display: flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-numero-site { order: 1; text-transform: uppercase; - font-size: 1.5rem; + font-size: 1rem; + display: inline-flex; } -@media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-numero-site { - font-size: 1.5rem; - } +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-numero-site::after { + content: "|"; + padding-left: 1rem; + padding-right: 1rem; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site { order: 3; - font-size: 1.4rem; + font-size: 1.2rem; } -@media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site { - font-size: 1rem; - line-height: 0.6rem; - padding-bottom: 0.3rem; - } -} -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .field__item { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .field__item { display: flex; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .field__item { + display: flex; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address { margin: 0; display: inline-flex; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .postal-code { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .postal-code { order: 2; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .locality { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .locality { order: 1; text-transform: capitalize; margin-right: 0.5rem; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .country { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .country { display: none; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-architecte { @@ -1929,8 +1933,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div width: fit-content; margin: auto; z-index: 99; - position: relative; - top: -20px; + margin-top: 2rem; } .block-page-title-block { @@ -1992,32 +1995,46 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div font-size: 1.6rem; font-weight: 900; line-height: 1; + padding-bottom: 0.8rem; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-numero-site { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row { + order: 1; + display: flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; +} +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-numero-site { order: 1; text-transform: uppercase; font-size: 1rem; + display: inline-flex; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-numero-site::after { + content: "|"; + padding-left: 1rem; + padding-right: 1rem; +} +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site { order: 3; font-size: 1.2rem; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .field__item { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .field__item { display: flex; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address { margin: 0; display: inline-flex; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .postal-code { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .postal-code { order: 2; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .locality { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .locality { order: 1; text-transform: capitalize; margin-right: 0.5rem; } -.view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .country { +.view-display-id-page_1 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .country { display: none; } .view-display-id-page_1 .views-row .node-type-site .infos-content-site .field--name-field-architecte { @@ -2056,17 +2073,24 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .view-display-id-page_1 footer { background-color: transparent; } -.view-display-id-page_1 footer p:first-of-type { +.view-display-id-page_1 footer p { font-size: 2rem; padding-left: 1rem; + font-weight: 1000; } .view-display-id-page_1 footer .view-display-id-block_2 { display: flex; flex-direction: row; flex-wrap: wrap; + align-items: baseline; + justify-content: space-between; } .view-display-id-page_1 footer .view-display-id-block_2 .views-row { - width: 30%; + width: 28%; + padding: 1rem; +} +.view-display-id-page_1 footer .view-display-id-block_2 .views-row:hover { + transform: none; } .view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site { margin: auto; @@ -2080,8 +2104,8 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div order: 2; display: flex; flex-direction: column; - padding-top: 0.5rem; - padding-left: 0rem; + padding-left: 1rem; + padding-right: 1rem; padding-right: 1rem; } .view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site h2 { @@ -2091,35 +2115,49 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div font-weight: 900; line-height: 1; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-lettre-de-site { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row { + order: 1; + display: flex; + flex-direction: row; + align-items: center; + padding-bottom: 0.5rem; +} +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-lettre-de-site { order: 1; text-transform: uppercase; font-size: 1rem; font-weight: 400; + display: flex; + align-items: center; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-lettre-de-site::before { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-lettre-de-site::before { content: "SITE"; padding-right: 0.5rem; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site { - order: 3; - font-weight: 400 !important; +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-lettre-de-site::after { + content: "|"; + padding-left: 1rem; + padding-right: 1rem; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site p.address { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site { + order: 3; +} +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site p.address { padding-left: 0; margin: 0; display: inline-flex; font-size: 1.3rem; + font-weight: 500 !important; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site p.address .postal-code { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site p.address .postal-code { order: 2; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site p.address .locality { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site p.address .locality { order: 1; text-transform: capitalize; margin-right: 0.5rem; } -.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site p.address .country { +.view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .first-row .field--name-field-adresse-site p.address .country { display: none; } .view-display-id-page_1 footer .view-display-id-block_2 .views-row .node-type-site .infos-content-site .field--name-field-architecte { @@ -2402,40 +2440,55 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div padding-top: 1rem; } .page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site h1 { - order: 2; + order: 3; margin: 0; font-size: 1.8rem; font-weight: 900; } .page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site h2 { - order: 2; + order: 3; margin: 0; font-size: 1.3rem; font-weight: 900; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-numero-site { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row { + order: 1; + display: flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; +} +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-numero-site { order: 1; text-transform: uppercase; - font-size: 1.5rem; + font-size: 1rem; + display: inline-flex; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-adresse-site { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-numero-site::after { + content: "|"; + padding-left: 1rem; + padding-right: 1rem; +} +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site { order: 3; font-size: 1.2rem; - line-height: 1.3rem; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-adresse-site .address { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .field__item { + display: flex; +} +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address { margin: 0; display: inline-flex; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-adresse-site .address .postal-code { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .postal-code { order: 2; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-adresse-site .address .locality { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .locality { order: 1; text-transform: capitalize; margin-right: 0.5rem; } -.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-adresse-site .address .country { +.page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .first-row .field--name-field-adresse-site .address .country { display: none; } .page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site .infos-content-site .field--name-field-date-de-construction { diff --git a/web/themes/custom/reha/dist/images/grandes_fleches_next.svg b/web/themes/custom/reha/dist/images/grandes_fleches_next.svg index 5ae3ad1..bbf98e1 100644 --- a/web/themes/custom/reha/dist/images/grandes_fleches_next.svg +++ b/web/themes/custom/reha/dist/images/grandes_fleches_next.svg @@ -2,9 +2,9 @@ + transform="matrix(0.73011607,0,0,0.73011607,-100.04968,-98.817968)"> + transform="matrix(-0.73011607,0,0,0.73011607,112.48256,-98.817968)"> diff --git a/web/themes/custom/reha/reha.theme b/web/themes/custom/reha/reha.theme index 1f17dc1..24a2838 100644 --- a/web/themes/custom/reha/reha.theme +++ b/web/themes/custom/reha/reha.theme @@ -43,6 +43,9 @@ function reha_preprocess_html(&$variables) { $body_field_content = ''; $files_field_content = ''; $liens_field_content = ''; + $numero_field_content = ''; + $adresse_field_content = ''; + $lettre_field_content = ''; foreach ($variables['content'] as $field_name => $field_content) { if ($field_name == 'body') { @@ -51,6 +54,12 @@ function reha_preprocess_html(&$variables) { $files_field_content = $field_content; } elseif ($field_name == 'field_liens') { $liens_field_content = $field_content; + } elseif ($field_name == 'field_adresse_site') { + $numero_field_content = $field_content; + } elseif ($field_name == 'field_numero_site') { + $adresse_field_content = $field_content; + } elseif ($field_name == 'field_lettre_de_site') { + $adresse_field_content = $field_content; } elseif (!in_array($field_name, $fields_to_exclude)) { $filtered_content[$field_name] = $field_content; } else { @@ -63,10 +72,12 @@ function reha_preprocess_html(&$variables) { $variables['body_field_content'] = $body_field_content; $variables['files_field_content'] = $files_field_content; $variables['liens_field_content'] = $liens_field_content; + $variables['adresse_field_content'] = $adresse_field_content; + $variables['numero_field_content'] = $numero_field_content; + $variables['field_lettre_de_site'] = $lettre_field_content; } } - - + function reha_preprocess_block(&$variables) { diff --git a/web/themes/custom/reha/scss/pages/home/home-view-sites.scss b/web/themes/custom/reha/scss/pages/home/home-view-sites.scss index d47516d..37f254e 100644 --- a/web/themes/custom/reha/scss/pages/home/home-view-sites.scss +++ b/web/themes/custom/reha/scss/pages/home/home-view-sites.scss @@ -3,10 +3,10 @@ .block-block-content3bb825b3-ab84-4861-a4f2-2a5e5eed74de{ border: solid $yellow-puca 1px; background-color: $white-button; - font-weight: 800; + font-weight: 1000; padding: 2rem; margin-right: 1rem; - width: 20vw; + width: 16vw; margin-left: 15%; padding-top: 0.5rem; padding-left: 0.8rem; @@ -52,9 +52,9 @@ grid-column: 2/span 10; width: 100%; img { - max-height: 500px; + max-height: 600px; width: 100%; - object-fit: cover; + object-fit: contain; } } .infos-content-site{ @@ -72,7 +72,7 @@ } h1{display: none;} h2{ - order: 2; + order: 3; margin: 0; font-size: 1.8rem; font-weight: 1000; @@ -81,41 +81,52 @@ line-height: 1.3rem; } } - .field--name-field-numero-site { + .first-row{ order: 1; - text-transform: uppercase; - font-size: 1.5rem; - @media(max-width: 891px){ - font-size: 1.5rem; - } - } - .field--name-field-adresse-site{ - order: 3; - font-size: 1.4rem; - @media(max-width: 891px){ + display:flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; + .field--name-field-numero-site { + order: 1; + text-transform: uppercase; font-size: 1rem; - line-height: 0.6rem; - padding-bottom: 0.3rem; - } - .field__item{ - display: flex; - } - .address{ - margin: 0; display: inline-flex; - .postal-code{ - order: 2; + &::after{ + content: '|'; + padding-left: 1rem; + padding-right: 1rem; } - .locality{ - order: 1; - text-transform: capitalize; - margin-right: 0.5rem; + } + .field--name-field-adresse-site{ + order: 3; + font-size: 1.2rem; + .field__item{ + display: flex; + } - .country{ - display: none; + .field__item{ + display: flex; + } + .address{ + margin: 0; + display: inline-flex; + .postal-code{ + order: 2; + } + .locality{ + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; + } + .country{ + display: none; + } } } } + + .field--name-field-architecte{ order: 4; font-size: 1.4rem; @@ -148,7 +159,8 @@ width: fit-content; margin: auto; z-index: 99; - position: relative; - top: -20px; + // position: relative; + // top: -10px; + margin-top: 2rem; } } diff --git a/web/themes/custom/reha/scss/pages/les-sites-pilotes.scss b/web/themes/custom/reha/scss/pages/les-sites-pilotes.scss index fd38298..ae28482 100644 --- a/web/themes/custom/reha/scss/pages/les-sites-pilotes.scss +++ b/web/themes/custom/reha/scss/pages/les-sites-pilotes.scss @@ -52,36 +52,49 @@ font-size: 1.6rem; font-weight: 900; line-height: 1; + padding-bottom: 0.8rem; } - .field--name-field-numero-site { + .first-row{ order: 1; - text-transform: uppercase; - font-size: 1rem; - } - .field--name-field-adresse-site{ - order: 3; - font-size: 1.2rem; - .field__item{ - display: flex; - - } - - .address{ - margin: 0; + display:flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; + .field--name-field-numero-site { + order: 1; + text-transform: uppercase; + font-size: 1rem; display: inline-flex; - .postal-code{ - order: 2; + &::after{ + content: '|'; + padding-left: 1rem; + padding-right: 1rem; } - .locality{ - order: 1; - text-transform: capitalize; - margin-right: 0.5rem; + } + .field--name-field-adresse-site{ + order: 3; + font-size: 1.2rem; + .field__item{ + display: flex; } - .country{ - display: none; + .address{ + margin: 0; + display: inline-flex; + .postal-code{ + order: 2; + } + .locality{ + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; + } + .country{ + display: none; + } } } } + .field--name-field-architecte{ order: 4; font-size: 1.2rem; @@ -125,31 +138,37 @@ footer{ background-color: transparent; - p:first-of-type{ + p{ font-size: 2rem; padding-left: 1rem; - // font-weight: 1000; + font-weight: 1000; } .view-display-id-block_2{ display: flex; flex-direction: row; flex-wrap: wrap; + align-items: baseline; + justify-content: space-between; .views-row{ - width: 30%; - // padding: 1rem; + width: 28%; + padding: 1rem; + &:hover{ + transform: none; + } .node-type-site{ margin: auto; display: flex; flex-direction: column; width: 100%; background-color: transparent; + .infos-content-site{ background-color: transparent; order: 2; display: flex; flex-direction: column; - padding-top: 0.5rem; - padding-left: 0rem; + padding-left: 1rem; + padding-right: 1rem;; padding-right: 1rem; h2{ order: 2; @@ -158,36 +177,50 @@ font-weight: 900; line-height: 1; } - .field--name-field-lettre-de-site { + .first-row{ order: 1; - text-transform: uppercase; - font-size: 1rem; - font-weight: 400; - &::before{ - content:'SITE'; - padding-right: 0.5rem; + display:flex; + flex-direction: row; + align-items: center; + padding-bottom: 0.5rem; + .field--name-field-lettre-de-site { + order: 1; + text-transform: uppercase; + font-size: 1rem; + font-weight: 400; + display: flex; + align-items: center; + + &::before{ + content:'SITE'; + padding-right: 0.5rem; + } + &::after{ + content: '|'; + padding-left: 1rem; + padding-right: 1rem; + } } - } - .field--name-field-adresse-site{ - order: 3; - // line-height: 1.3rem; - font-weight: 400 !important; + .field--name-field-adresse-site{ + order: 3; - p.address{ - padding-left: 0; - margin: 0; - display: inline-flex; - font-size: 1.3rem; - .postal-code{ - order: 2; - } - .locality{ - order: 1; - text-transform: capitalize; - margin-right: 0.5rem; - } - .country{ - display: none; + p.address{ + padding-left: 0; + margin: 0; + display: inline-flex; + font-size: 1.3rem; + font-weight: 500!important; + .postal-code{ + order: 2; + } + .locality{ + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; + } + .country{ + display: none; + } } } } diff --git a/web/themes/custom/reha/scss/pages/node-site.scss b/web/themes/custom/reha/scss/pages/node-site.scss index 1d63de6..a86026a 100644 --- a/web/themes/custom/reha/scss/pages/node-site.scss +++ b/web/themes/custom/reha/scss/pages/node-site.scss @@ -94,44 +94,61 @@ padding-bottom: 4rem; padding-top: 1rem; h1{ - order: 2; + order: 3; margin: 0; font-size: 1.8rem; font-weight: 900; } h2{ - order: 2; + order: 3; margin: 0; font-size: 1.3rem; font-weight: 900; } - .field--name-field-numero-site { + .first-row{ order: 1; - text-transform: uppercase; - font-size: 1.5rem; - } - .field--name-field-adresse-site{ - order: 3; - font-size: 1.2rem; - line-height: 1.3rem; - - .address{ - margin: 0; + display:flex; + flex-direction: row; + align-items: end; + padding-bottom: 0.5rem; + .field--name-field-numero-site { + order: 1; + text-transform: uppercase; + font-size: 1rem; display: inline-flex; - .postal-code{ - order: 2; + &::after{ + content: '|'; + padding-left: 1rem; + padding-right: 1rem; } - .locality{ - order: 1; - text-transform: capitalize; - margin-right: 0.5rem; + } + .field--name-field-adresse-site{ + order: 3; + font-size: 1.2rem; + .field__item{ + display: flex; + } - .country{ - display: none; + + .address{ + margin: 0; + display: inline-flex; + .postal-code{ + order: 2; + } + .locality{ + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; + } + .country{ + display: none; + } } } } + .field--name-field-date-de-construction{ order: 5; font-size: 1.2rem; diff --git a/web/themes/custom/reha/templates/node--site.html.twig b/web/themes/custom/reha/templates/node--site.html.twig index 611f94b..82f4018 100644 --- a/web/themes/custom/reha/templates/node--site.html.twig +++ b/web/themes/custom/reha/templates/node--site.html.twig @@ -107,7 +107,7 @@ {# Envelopper le titre et tous les autres champs dans une nouvelle div #}
-

{{ node.label }}

+

{{ node.label }}

{% if label and not page %} {{ label }} @@ -116,7 +116,16 @@ {% for field_name, field_content in filtered_content %} {{ field_content }} + {% endfor %} + {% if adresse_field_content is defined %} +
+ {{ numero_field_content }} + {{ adresse_field_content }} + {{ lettre_field_content }} +
+ {% endif %} +
{% if body_field_content is defined or files_field_content is defined %}