diff --git a/private/4/Impot_sur_les_revenus_2022_Avance_de_reductions_et_credits_d_impot.pdf b/private/4/Impot_sur_les_revenus_2022_Avance_de_reductions_et_credits_d_impot.pdf new file mode 100644 index 0000000..d2ed2a0 Binary files /dev/null and b/private/4/Impot_sur_les_revenus_2022_Avance_de_reductions_et_credits_d_impot.pdf differ diff --git a/private/4/afficheA3_chorale_2023.pdf b/private/4/afficheA3_chorale_2023.pdf new file mode 100644 index 0000000..da656e4 Binary files /dev/null and b/private/4/afficheA3_chorale_2023.pdf differ diff --git a/private/47/Document_de_Synthese_J00075735720_v3.pdf b/private/47/Document_de_Synthese_J00075735720_v3.pdf new file mode 100644 index 0000000..0318abc Binary files /dev/null and b/private/47/Document_de_Synthese_J00075735720_v3.pdf differ diff --git a/web/private:/.htaccess b/web/private:/.htaccess new file mode 100644 index 0000000..b0dc540 --- /dev/null +++ b/web/private:/.htaccess @@ -0,0 +1,24 @@ +# Deny all requests from Apache 2.4+. + + Require all denied + + +# Deny all requests from Apache 2.0-2.2. + + Deny from all + + +# Turn off all options we don't need. +Options -Indexes -ExecCGI -Includes -MultiViews + +# Set the catch-all handler to prevent scripts from being executed. +SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 + + # Override the handler again if we're run later in the evaluation list. + SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 + + +# If we know how to do it safely, disable the PHP engine entirely. + + php_flag engine off + \ No newline at end of file diff --git a/web/themes/custom/reha/dist/css/bundle.css b/web/themes/custom/reha/dist/css/bundle.css index d1413c5..79c6339 100644 --- a/web/themes/custom/reha/dist/css/bundle.css +++ b/web/themes/custom/reha/dist/css/bundle.css @@ -4,10 +4,11 @@ /* Colors used for REHA */ #block-reha-contenudelapageprincipale #node-operation-edit-form #edit-field-dossier-de-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale #node-operation-edit-form #edit-field-fiche-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale .node-operation-form #edit-field-dossier-de-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale .node-operation-form #edit-field-fiche-candidature-wrapper .form-managed-file, .layout-sidebar-first #block-reha-phase1 footer, #edit-field-telephone-0-phone, .form-submit, .views-field-edit-user, .views-field-edit-node, .links, .field--type-file, .field--type-link, .page-programme .field--type-link { text-transform: uppercase; - padding: 1rem; + padding: 0.5rem; border: solid black 1px; margin-bottom: 1rem; background-color: rgb(255, 255, 255); + font-size: 0.9rem; } @media (max-width: 891px) { #block-reha-contenudelapageprincipale #node-operation-edit-form #edit-field-dossier-de-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale #node-operation-edit-form #edit-field-fiche-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale .node-operation-form #edit-field-dossier-de-candidature-wrapper .form-managed-file, #block-reha-contenudelapageprincipale .node-operation-form #edit-field-fiche-candidature-wrapper .form-managed-file, .layout-sidebar-first #block-reha-phase1 footer, #edit-field-telephone-0-phone, .form-submit, .views-field-edit-user, .views-field-edit-node, .links, .field--type-file, .field--type-link, .page-programme .field--type-link { @@ -17,15 +18,13 @@ .page-programme .field--type-link { width: fit-content; - padding: 0.4rem; + padding: 0.3rem; + background-color: transparent; } .field--type-link { width: fit-content; } -.field--type-link .page-programme { - padding: 0.4rem; -} .bouton { background-color: rgb(255, 255, 255) !important; @@ -281,7 +280,7 @@ svg.ext { /*partials*/ header { display: block; - height: 150px; + height: 120px; background-color: rgb(255, 255, 255); z-index: 99; width: 100vw; @@ -310,10 +309,9 @@ header .region-header { } header .region-header #block-reha-logoministere { grid-column: 1; - width: 200px; + width: 135px; min-width: 100px; padding-left: 80px; - padding-top: 30px; height: 100%; } header .region-header #block-reha-logoministere img { @@ -328,18 +326,18 @@ header .region-header #block-reha-logoministere img { } header .region-header #block-reha-logoreha { grid-column: 2; - height: 150px; - padding-top: 20px; + height: 110px; + padding-left: 1rem; } header .region-header #block-reha-logoreha .field--name-field-logo { - height: 150px; + height: 110px; } header .region-header #block-reha-logoreha .field--name-field-logo .field__item { - height: 150px; + height: 110px; } header .region-header #block-reha-logoreha .field--name-field-logo .field__item img { - max-height: inherit; - width: fit-content; + max-height: 110px; + width: auto; } header .region-header #block-reha-navigationprincipale { grid-column: 3/span 5; @@ -1679,10 +1677,10 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div font-weight: 800; padding: 2rem; margin-right: 1rem; - width: 20%; + width: 20vw; margin-left: 12%; padding-top: 0.5rem; - padding-left: 0.5rem; + padding-left: 0.8rem; padding-bottom: 5rem; } @media (max-width: 891px) { @@ -1694,9 +1692,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 p { margin: 0; + font-size: 1.3rem; } .home-page-layout-content .block-block-content3bb825b3-ab84-4861-a4f2-2a5e5eed74de strong { - font-size: 1.3rem; + font-size: 1.5rem; } .home-page-layout-content .block-views-blocksites-block-1 { top: -60px; @@ -1730,12 +1729,13 @@ 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 { - height: 500px; - width: auto; + max-height: 500px; + width: 100%; + object-fit: cover; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site { background-color: rgb(255, 255, 255); - width: 80%; + width: 20vw; order: 2; display: flex; flex-direction: column; @@ -1745,60 +1745,60 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div z-index: 99; } @media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content { + .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site { width: auto; } } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content h1 { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site h1 { display: none; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content h2 { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site h2 { order: 2; margin: 0; } @media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content h2 { + .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site h2 { font-size: 1.2rem; line-height: 1.3rem; } } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-numero-site { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-numero-site { order: 1; text-transform: uppercase; font-size: 2rem; } @media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-numero-site { + .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 .filtered-content .field--name-field-adresse-site { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site { order: 3; font-size: 1.5rem; } @media (max-width: 891px) { - .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site { + .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 .filtered-content .field--name-field-adresse-site .address { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .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 .filtered-content .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 .field--name-field-adresse-site .address .postal-code { order: 2; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site .address .locality { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .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 .filtered-content .field--name-field-adresse-site .address .country { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-adresse-site .address .country { display: none; } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-architecte { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .infos-content-site .field--name-field-architecte { order: 4; } .home-page-layout-content .block-block-content9e601647-144f-4e8e-b9e1-7d744f9141d7 { @@ -1806,6 +1806,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div margin: auto; z-index: 99; position: relative; + top: -20px; } .view-display-id-page_1 { @@ -1988,6 +1989,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .block-views-blockactus-block-1 { background-color: white; padding-bottom: 3rem; + padding-left: 12%; } .block-views-blockactus-block-1 h2 { width: 80%; @@ -2000,8 +2002,8 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div margin: auto; } .block-views-blockactus-block-1 .view-id-actus .views-row { - width: 30%; - padding-right: 2rem; + width: 20vw !important; + padding-right: 5rem; } .block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite { width: 100%; @@ -2076,10 +2078,10 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .page--home .home-page-layout-content .block-views-blockhome-block-1 .view-display-id-block_1 { width: 60%; margin: auto; - padding-top: 5rem; - max-height: 300px; + padding-top: 3rem; overflow: hidden; text-overflow: ellipsis; + font-size: 1.3rem; /* Masquer tous les paragraphes après le premier */ } @media (max-width: 891px) { @@ -2107,6 +2109,11 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div } .page-programme .block-region-second h2 { font-weight: 1000; + font-size: 1.8rem; +} +.page-programme .block-region-second .block-views-blockhome-block-1 { + width: 80%; + font-size: 1.2rem; } .page-programme .block-region-second .view-display-id-block_1 { margin: 0; @@ -2121,9 +2128,12 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire { width: 100%; padding-bottom: 3rem; - display: grid; - grid-template-columns: repeat(7, 1fr); - grid-template-rows: repeat(auto-fill); + height: 205px; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: center; + align-content: baseline; } @media (max-width: 810px) { .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire { @@ -2131,28 +2141,22 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div flex-direction: column; } } +.page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .paragraph--type--partenaire > * { + flex: 1 1 80px; +} .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .field--name-field-logo { - grid-column: 1/2; - grid-row: 2; - margin-top: 2rem; + width: fit-content; padding-right: 1rem; } .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .field--name-field-nom { - grid-column: 2/8; - grid-row: 1; font-weight: 900; font-size: 1.2rem; } -.page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .field--name-field-texte { - grid-column: 2/8; - grid-row: 2; -} .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .field--name-field-texte .field__item p strong { background-color: none; } .page-programme .block-region-second .block-config-pages-block .config_pages--partenaires--full .paragraph--type--partenaire .field--name-field-lien { - grid-column: 2/8; - grid-row: 3; + background-color: none; } .page-node-site .block-region-first .block-entity-fieldnodefield-fichiers { @@ -2177,7 +2181,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div position: relative; } .page-node-site .region-content .node-type-site .image-site .field--name-field-image { - width: 80%; + width: 100%; margin: auto; } .page-node-site .region-content .node-type-site .image-site .field--name-field-image .field__item { @@ -2188,6 +2192,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div width: 100%; object-fit: cover; height: auto; + padding-left: 13%; } .page-node-site .region-content .node-type-site .image-site .field--name-field-image .field__item blockquote { align-self: flex-end; @@ -2199,7 +2204,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div margin: 0; padding-left: 1rem; } -.page-node-site .region-content .node-type-site .filtered-content { +.page-node-site .region-content .node-type-site .infos-content-site { z-index: 99; background-color: rgb(255, 255, 255); width: 25vw; @@ -2211,51 +2216,51 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div padding-bottom: 4rem; padding-top: 1rem; } -.page-node-site .region-content .node-type-site .filtered-content h1 { +.page-node-site .region-content .node-type-site .infos-content-site h1 { order: 2; margin: 0; font-size: 1.3rem; font-weight: 900; } -.page-node-site .region-content .node-type-site .filtered-content h2 { +.page-node-site .region-content .node-type-site .infos-content-site h2 { order: 2; margin: 0; font-size: 1.3rem; font-weight: 900; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-numero-site { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-numero-site { order: 1; text-transform: uppercase; font-size: 1.5rem; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-adresse-site { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-adresse-site { order: 3; font-size: 1rem; line-height: 1.3rem; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-adresse-site .address { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-adresse-site .address { margin: 0; display: inline-flex; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-adresse-site .address .postal-code { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-adresse-site .address .postal-code { order: 2; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-adresse-site .address .locality { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-adresse-site .address .locality { order: 1; text-transform: capitalize; margin-right: 0.5rem; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-adresse-site .address .country { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-adresse-site .address .country { display: none; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-date-de-construction { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-date-de-construction { order: 5; } -.page-node-site .region-content .node-type-site .filtered-content .field--name-field-architecte { +.page-node-site .region-content .node-type-site .infos-content-site .field--name-field-architecte { order: 4; padding-top: 1rem; } -.page-node-site .region-content .node-type-site .filtered-content ul.links { +.page-node-site .region-content .node-type-site .infos-content-site ul.links { order: 5; text-transform: uppercase; padding: 0; @@ -2265,10 +2270,18 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div padding-top: 0.9rem; display: inline-flex; } -.page-node-site .region-content .node-type-site .filtered-content ul.links::after { +.page-node-site .region-content .node-type-site .infos-content-site ul.links::after { content: url("../../dist/images/noun-arrow-1569918-black.svg"); padding-left: 0.5rem; } +.page-node-site .region-content .node-type-site .body-content-site { + order: 3; + top: -60px; + position: relative; + width: 50%; + margin: auto; + font-size: 1.3rem; +} .page-ressources .view-ressources { flex-direction: column; @@ -2433,9 +2446,6 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div width: fit-content; padding: 0.2rem 0.9rem; } -.page-actualites .view-actus .views-row .node-type-actualite .infos-content .field--name-field-site div:nth-child(1) { - display: none; -} .page-actualites .view-actus .views-row .node-type-actualite .infos-content .field--name-field-site .field__item { display: inline; } diff --git a/web/themes/custom/reha/reha.theme b/web/themes/custom/reha/reha.theme index 4aa262d..b463772 100644 --- a/web/themes/custom/reha/reha.theme +++ b/web/themes/custom/reha/reha.theme @@ -64,111 +64,17 @@ function reha_preprocess_html(&$variables) { $variables['files_field_content'] = $files_field_content; $variables['liens_field_content'] = $liens_field_content; } - - // if ($node->getType() == 'site') { - // $blocks_to_exclude = [ - // 'block-entity-fieldnodefield-image', - // ]; - - // $filtered_block_content = []; - // $image_block_content = ''; - - // foreach ($variables['content'] as $block_name => $field_content) { - // if (!in_array($block_name, $blocks_to_exclude)) { - // $filtered_block_content[$block_name] = $field_content; - // } else { - // $image_block_content = $field_content; - // } - // } - - // // Set variables for the template - // $variables['filtered_block_content'] = $filtered_block_content; - // $variables['image_block_content'] = $image_block_content; - - // } } -/** - * Implements hook_preprocess_HOOK() for page templates. - */ -// function reha_preprocess_page(&$variables) { -// // Vérifiez si c'est une page de nœud. -// if ($node = \Drupal::routeMatch()->getParameter('node')) { -// if ($node instanceof \Drupal\node\NodeInterface) { -// // Ajoutez une classe unique basée sur le nid (Node ID). -// $variables['attributes']['class'][] = 'page-node-' . $node->id(); -// // Ajoutez un ID unique basé sur le nid. -// $variables['attributes']['id'] = 'page-node-' . $node->id(); -// } -// } -// else { -// // Si ce n'est pas une page de nœud, vous pouvez ajouter un ID basé sur le nom de la route. -// $route_name = \Drupal::routeMatch()->getRouteName(); -// $variables['attributes']['id'] = 'page-' . str_replace('.', '-', $route_name); -// } - -// } - - - - -// /** -// * Implements hook_preprocess_HOOK() for node templates. -// */ -// function reha_preprocess_node(&$variables) { -// if ($variables['node']->getType() == 'site') { -// $fields_to_exclude = [ -// 'field--type-image', // Remplacez par le nom machine exact de votre champ image -// ]; - -// $filtered_content = []; -// $image_field_content = ''; - -// foreach ($variables['content'] as $field_name => $field_content) { -// if (!in_array($field_name, $fields_to_exclude)) { -// $filtered_content[$field_name] = $field_content; -// } else { -// $image_field_content = $field_content; -// } -// } - -// $variables['filtered_content'] = $filtered_content; -// $variables['image_field_content'] = $image_field_content; -// } -// } - - - -/** - * Prepares variables for block templates. - * - * Default template: block.html.twig. - * - * Prepares the values passed to the theme_block function to be passed - * into a pluggable template engine. Uses block properties to generate a - * series of template file suggestions. If none are found, the default - * block.html.twig is used. - * - * Most themes use their own copy of block.html.twig. The default is located - * inside "core/modules/block/templates/block.html.twig". Look in there for the - * full list of available variables. - * - * @param array $variables - * An associative array containing: - * - elements: An associative array containing the properties of the element. - * Properties used: #block, #configuration, #children, #plugin_id. - */ - -//https://www.hashbangcode.com/article/drupal-9-programmatically-creating-and-using-urls-and-links function reha_preprocess_block(&$variables) { // Conserver les IDs existants et générer un ID unique uniquement si aucun ID n'est présent - if (empty($variables['attributes']['id'])) { - $block_id = 'block-' . uniqid(); - $variables['attributes']['id'] = $block_id; -} + if (empty($variables['attributes']['id'])) { + $block_id = 'block-' . uniqid(); + $variables['attributes']['id'] = $block_id; + } if ($variables['plugin_id'] === "user_login_block") { $url = new Url('user.register', [], ['query' => ['destination' => '/node/add/operation']]); @@ -195,42 +101,6 @@ function reha_preprocess_block(&$variables) { ]; } } - - // // Extraction du texte du

et transformation en ID - // if (isset($variables['content']['#contextual_links']['block']['h2'])) { - // $h2_text = $variables['content']['#contextual_links']['block']['h2']; - // $block_id = Html::cleanCssIdentifier($h2_text); - // $variables['attributes']['id'] = $block_id; - // } elseif (isset($variables['content']['#block_content']['body']['0']['#text'])) { - // $h2_text = $variables['content']['#block_content']['body']['0']['#text']; - // $block_id = Html::cleanCssIdentifier(strip_tags($h2_text)); - // $variables['attributes']['id'] = $block_id; - // } else { - // // Fallback ID if no

is found - // $block_id = Html::cleanCssIdentifier($variables['plugin_id']); - // $variables['attributes']['id'] = $block_id; - // } - } - // if ($variables['plugin_id'] == 'actus-block-1') { - // $fields_to_exclude = [ - // 'field_image', // Remplacez par le nom machine exact du champ que vous souhaitez exclure - // ]; - - // $filtered_content = []; - // $excluded_field_content = ''; - - // foreach ($variables['content'] as $field_name => $field_content) { - // if (!in_array($field_name, $fields_to_exclude)) { - // $filtered_content[$field_name] = $field_content; - // } else { - // $excluded_field_content = $field_content; - // } - // } - - // $variables['filtered_content'] = $filtered_content; - // $variables['excluded_field_content'] = $excluded_field_content; - // } - } diff --git a/web/themes/custom/reha/scss/global/_layout.scss b/web/themes/custom/reha/scss/global/_layout.scss index 0df24c4..ed92239 100644 --- a/web/themes/custom/reha/scss/global/_layout.scss +++ b/web/themes/custom/reha/scss/global/_layout.scss @@ -1,5 +1,5 @@ -$header-height : 150px; +$header-height : 110px; $width-menu-slidedown : 550px; .layout-container { diff --git a/web/themes/custom/reha/scss/global/variables/_buttons.scss b/web/themes/custom/reha/scss/global/variables/_buttons.scss index cdde642..78fbee6 100644 --- a/web/themes/custom/reha/scss/global/variables/_buttons.scss +++ b/web/themes/custom/reha/scss/global/variables/_buttons.scss @@ -3,10 +3,11 @@ %buttonwithborder { text-transform: uppercase; - padding: 1rem; + padding: 0.5rem; border: solid black 1px; margin-bottom: 1rem; background-color: $white-button; + font-size: 0.9rem; @media (max-width:891px) { font-size: 1rem; } @@ -23,15 +24,12 @@ .page-programme .field--type-link { @extend %buttonwithborder; width: fit-content; - padding: 0.4rem; - + padding: 0.3rem; + background-color: transparent; } .field--type-link { @extend %buttonwithborder; width: fit-content; - .page-programme{ - padding: 0.4rem; - } } diff --git a/web/themes/custom/reha/scss/pages/actualites.scss b/web/themes/custom/reha/scss/pages/actualites.scss index 6d67b44..470ad9f 100644 --- a/web/themes/custom/reha/scss/pages/actualites.scss +++ b/web/themes/custom/reha/scss/pages/actualites.scss @@ -54,10 +54,7 @@ border-radius: 50px; width: fit-content; padding: 0.2rem 0.9rem; - div:nth-child(1) - { - display: none; - } + .field__item{ display: inline; } diff --git a/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss b/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss index 8fd3132..f4e2bd9 100644 --- a/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss +++ b/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss @@ -2,6 +2,7 @@ // display:none; background-color: white; padding-bottom: 3rem; + padding-left: 12%; h2{ width: 80%; margin: auto; @@ -15,8 +16,8 @@ // justify-content: space-between; .views-row{ - width: 30%; - padding-right: 2rem; + width: 20vw !important; + padding-right: 5rem; .node-type-actualite{ width: 100%; display: flex; diff --git a/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss b/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss index 380ffaf..57865d5 100644 --- a/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss +++ b/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss @@ -6,10 +6,11 @@ .view-display-id-block_1{ width: 60%; margin: auto; - padding-top: 5rem; - max-height: 300px; + padding-top: 3rem; + // max-height: 300px; overflow: hidden; text-overflow: ellipsis; + font-size: 1.3rem; @media(max-width: 891px){ width: 80%; padding-top: 3rem; 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 d6eff20..db4be27 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 @@ -6,10 +6,10 @@ font-weight: 800; padding: 2rem; margin-right: 1rem; - width: 20%; + width: 20vw; margin-left: 12%; padding-top: 0.5rem; - padding-left: 0.5rem; + padding-left: 0.8rem; padding-bottom: 5rem; @media(max-width: 891px){ margin-bottom: 1rem; @@ -17,10 +17,13 @@ width: 50%; // margin: auto; } - p{margin: 0;} - strong{ + p{ + margin: 0; font-size: 1.3rem; } + strong{ + font-size: 1.5rem; + } } .block-views-blocksites-block-1 { top: -60px; @@ -52,14 +55,15 @@ // width: 70%; // // object-fit: cover; // height: auto; - height: 500px; - width: auto; + max-height: 500px; + width: 100%; + object-fit: cover; } } - .filtered-content{ + .infos-content-site{ // border: solid $yellow-puca 1px; background-color: $white-button; - width: 80%; + width: 20vw; order: 2; display: flex; flex-direction: column; @@ -126,5 +130,6 @@ margin: auto; z-index: 99; position: relative; + top: -20px; } } diff --git a/web/themes/custom/reha/scss/pages/le-programme.scss b/web/themes/custom/reha/scss/pages/le-programme.scss index 9adb377..fbabe52 100644 --- a/web/themes/custom/reha/scss/pages/le-programme.scss +++ b/web/themes/custom/reha/scss/pages/le-programme.scss @@ -6,49 +6,48 @@ .block-region-second{ h2{ font-weight: 1000; + font-size: 1.8rem; + } + .block-views-blockhome-block-1{ + width: 80%; + font-size: 1.2rem; } .view-display-id-block_1{ margin: 0; width: 80%; padding-top: 1rem; - } - - - - .block-config-pages-block{ + } + + .block-config-pages-block{ margin: 0; width: 80%; padding-top: 1rem; .config_pages--partenaires--full{ - .paragraph--type--partenaire{ - // background-color: $white; width: 100%; padding-bottom: 3rem; - display: grid; - grid-template-columns: repeat(7, 1fr); - grid-template-rows: repeat(auto-fill); + height: 205px; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: center; + align-content: baseline; @media (max-width: 810px){ display: flex; flex-direction: column; } + .paragraph--type--partenaire>* { + flex: 1 1 80px; + } .field--name-field-logo{ - - grid-column: 1 / 2; - grid-row: 2; - margin-top: 2rem; + width: fit-content; padding-right: 1rem; } .field--name-field-nom{ - grid-column: 2 / 8; - grid-row: 1; font-weight: 900; font-size: 1.2rem - } .field--name-field-texte{ - grid-column: 2 / 8; - grid-row: 2; .field__item{ p{ strong{ @@ -56,20 +55,15 @@ } } } - } .field--name-field-lien{ - grid-column: 2 / 8; - grid-row: 3; + background-color: none; } } } - } - - } } diff --git a/web/themes/custom/reha/scss/pages/node-site.scss b/web/themes/custom/reha/scss/pages/node-site.scss index 1800c74..c4ede3c 100644 --- a/web/themes/custom/reha/scss/pages/node-site.scss +++ b/web/themes/custom/reha/scss/pages/node-site.scss @@ -14,15 +14,6 @@ #block-reha-titredepage{ display: none; - // background-color: white; - // width: 25vw; - // padding-top: 1rem; - // padding-left: 1rem; - // padding-right: 1rem; - // font-size: 0.8rem; - // h1{ - // margin: 0 ; - // } } .node-type-site{ margin: auto; @@ -35,16 +26,18 @@ .field--name-field-image{ // position: relative; // order: 2; - width: 80%; + width: 100%; margin: auto; // max-width: 100%; .field__item{ display: flex; flex-direction: row; + // padding-left: 20%; img{ width: 100%; object-fit: cover; height: auto; + padding-left: 13%; } blockquote{ align-self: flex-end; @@ -61,7 +54,7 @@ } } - .filtered-content{ + .infos-content-site{ z-index: 99; background-color: $white-button; width: 25vw; @@ -135,6 +128,14 @@ } } + .body-content-site{ + order: 3; + top: -60px; + position: relative; + width: 50%; + margin: auto; + font-size: 1.3rem; + } } } } \ No newline at end of file diff --git a/web/themes/custom/reha/scss/partials/_header.scss b/web/themes/custom/reha/scss/partials/_header.scss index 3348ab0..a849553 100644 --- a/web/themes/custom/reha/scss/partials/_header.scss +++ b/web/themes/custom/reha/scss/partials/_header.scss @@ -2,7 +2,7 @@ header{ display: block; - height: 150px; + height: 120px; background-color: $white-header; z-index: 99; width: 100vw; @@ -29,10 +29,10 @@ header{ #block-reha-logoministere{ grid-column: 1; - width: 200px; + width: 135px; min-width: 100px; padding-left: 80px; - padding-top: 30px; + // padding-top: 30px; height: 100%; img{ max-width: 100%; @@ -55,14 +55,15 @@ header{ grid-column: 2; // max-height: 80%; height: $header-height; - padding-top: 20px; + padding-left: 1rem; + // padding-top: 20px; .field--name-field-logo{ height: $header-height; .field__item{ height: $header-height; img{ - max-height:inherit; - width: fit-content; + max-height:$header-height; + width: auto; } } } diff --git a/web/themes/custom/reha/templates/node--site.html.twig b/web/themes/custom/reha/templates/node--site.html.twig index 875514b..611f94b 100644 --- a/web/themes/custom/reha/templates/node--site.html.twig +++ b/web/themes/custom/reha/templates/node--site.html.twig @@ -106,7 +106,7 @@ {% endif %} {# Envelopper le titre et tous les autres champs dans une nouvelle div #} -
+

{{ node.label }}

{% if label and not page %} @@ -118,6 +118,21 @@ {{ field_content }} {% endfor %}
+ {% if body_field_content is defined or files_field_content is defined %} +
+ {% if body_field_content is defined %} +
+ {{ body_field_content }} +
+ {% endif %} + {% if files_field_content is defined %} + + {% endif %} +
+ {% endif %} {{ title_suffix }} diff --git a/web/themes/custom/reha/templates/paragraph--partenaire--complet.html.twig b/web/themes/custom/reha/templates/paragraph--partenaire--complet.html.twig new file mode 100644 index 0000000..fa3ba93 --- /dev/null +++ b/web/themes/custom/reha/templates/paragraph--partenaire--complet.html.twig @@ -0,0 +1,55 @@ +{# +/** + * @file + * Default theme implementation to display a paragraph. + * + * Available variables: + * - paragraph: Full paragraph entity. + * Only method names starting with "get", "has", or "is" and a few common + * methods such as "id", "label", and "bundle" are available. For example: + * - paragraph.getCreatedTime() will return the paragraph creation timestamp. + * - paragraph.id(): The paragraph ID. + * - paragraph.bundle(): The type of the paragraph, for example, "image" or "text". + * - paragraph.getOwnerId(): The user ID of the paragraph author. + * See Drupal\paragraphs\Entity\Paragraph for a full list of public properties + * and methods for the paragraph object. + * - content: All paragraph items. Use {{ content }} to print them all, + * or print a subset such as {{ content.field_example }}. Use + * {{ content|without('field_example') }} to temporarily suppress the printing + * of a given child element. + * - attributes: HTML attributes for the containing element. + * The attributes.class element may contain one or more of the following + * classes: + * - paragraphs: The current template type (also known as a "theming hook"). + * - paragraphs--type-[type]: The current paragraphs type. For example, if the paragraph is an + * "Image" it would result in "paragraphs--type--image". Note that the machine + * name will often be in a short form of the human readable label. + * - paragraphs--view-mode--[view_mode]: The View Mode of the paragraph; for example, a + * preview would result in: "paragraphs--view-mode--preview", and + * default: "paragraphs--view-mode--default". + * - view_mode: View mode; for example, "preview" or "full". + * - logged_in: Flag for authenticated user status. Will be true when the + * current user is a logged-in member. + * - is_admin: Flag for admin user status. Will be true when the current user + * is an administrator. + * + * @see template_preprocess_paragraph() + * + * @ingroup themeable + */ +#} +{% + set classes = [ + 'paragraph', + 'paragraph--type--' ~ paragraph.bundle|clean_class, + view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class, + not paragraph.isPublished() ? 'paragraph--unpublished' + ] +%} +{% block paragraph %} + + {% block content %} + {{ content }} + {% endblock %} +
+{% endblock paragraph %}