diff --git a/web/themes/custom/eql/css-compiled/styles.css b/web/themes/custom/eql/css-compiled/styles.css index 9c6263c..1a6bb3f 100644 --- a/web/themes/custom/eql/css-compiled/styles.css +++ b/web/themes/custom/eql/css-compiled/styles.css @@ -654,6 +654,48 @@ a { color: #e1000f; margin-top: 0.8rem; font-size: 0.7rem; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-region { + order: 5; + color: black; + font-size: 0.7rem; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-type-de-moa { + order: 6; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-type-de-moa a { + color: black; + font-size: 0.7rem; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-type-de-projet { + order: 7; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-type-de-projet a { + color: black; + font-size: 0.7rem; } + .path-frontpage .block-views-blockprojets-block-4 .view-projets .view-content .views-row .node-type-projet div:first-child .field--name-field-etape-du-projet { + order: 8; + color: black; + font-size: 0.7rem; } + +.path-frontpage .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f { + display: flex; + flex-flow: row-reverse; + top: -109px; + position: relative; + right: 200px; } + .path-frontpage .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f .field--type-text-with-summary { + height: fit-content; + padding: 0.4rem 1rem; + font-size: 0.8rem; + margin: 0; + background-color: white; + border: 2px solid #009ee3; + list-style: none; + display: inline-flex; } + .path-frontpage .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f a { + text-transform: uppercase; + font-weight: 700; + color: #009ee3; + display: inline-flex; + align-items: center; } + .path-frontpage .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f a::after { + content: url('data:image/svg+xml,'); } .path-frontpage .block-views-blockprojets-block-2 #leaflet-map-view-projets-block-2 { height: 500px !important; } @@ -1493,6 +1535,9 @@ a { .node-id-6 .layout__region--second .block-region-second .block-entity-fieldnodefield-textes .paragraph--type--texte a svg { display: none; } +.page-node-type-ressource .layout__region--top .block-region-top .block-entity-fieldnodefield-images { + display: none; } + .page-node-type-ressource .layout__region--top .block-region-top .block-block-content4e5df355-e76c-4e44-bec0-e211d94f2640 { width: 100%; font-family: 'Source Code Pro'; @@ -3006,7 +3051,8 @@ a { .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top { padding-top: 4rem; margin-left: 10%; - margin-right: 10%; } + margin-right: 10%; + width: 80vw; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_top { display: flex; flex-direction: row; @@ -3015,8 +3061,8 @@ a { width: 60%; padding-right: 2rem; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_top .block-entity-fieldnodefield-photo img { - width: 65%; - object-fit: cover; } + object-fit: contain; + width: inherit; } @media (max-width: 810px) { .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_top .block-entity-fieldnodefield-photo img { padding-top: 1rem; @@ -3051,7 +3097,7 @@ a { margin-top: 2rem; width: fit-content; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_top .top_right .block-entity-fieldnodefield-incube .field--name-field-incube { - background-color: red; + background-color: #e1000f; color: white; font-weight: 800; padding-right: 0.3rem; @@ -3062,23 +3108,41 @@ a { border: 0.1rem solid; justify-content: space-evenly; width: 90%; } - .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-adresse { - padding-left: 1.5rem; - width: 30%; } - .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-adresse .field--name-field-adresse { - display: flex; - flex-direction: row; - margin-top: .83em; } - .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-adresse .field--name-field-adresse .address { - margin: auto; + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left { + padding-right: 1rem; + order: 1; + width: 30%; + position: relative; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left::before { + content: url("../images/pictos/picto_lieu.svg"); + display: inline-block; + width: 50px; + padding-right: 1rem; + position: absolute; + left: 0; + margin-top: .83em; + margin-left: 1rem; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left .block-entity-fieldnodefield-region { + order: 1; + margin-left: 70px; + margin-bottom: 1rem; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left .block-entity-fieldnodefield-adresse { + order: 2; + margin-left: 70px; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left .block-entity-fieldnodefield-adresse .field--name-field-adresse { display: flex; - flex-direction: column; - justify-content: start; - margin: 0; } - .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-adresse .field--name-field-adresse::before { - content: url("../images/pictos/picto_lieu.svg"); - padding-right: 1rem; } + flex-direction: row; + margin-top: .83em; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left .block-entity-fieldnodefield-adresse .field--name-field-adresse .address { + margin: auto; + display: flex; + flex-direction: column; + justify-content: start; + margin: 0; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .top_bottom_left .block-entity-fieldnodefield-adresse .field--name-field-adresse .address .country { + display: none; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-etape-du-projet { + order: 4; padding-left: 1rem; padding-right: 1rem; padding-bottom: 1rem; @@ -3095,6 +3159,7 @@ a { .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-etape-du-projet .field__label { display: none; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-type-de-moa { + order: 2; padding-left: 1rem; border-left: 0.1rem solid; padding-bottom: 1rem; @@ -3110,6 +3175,7 @@ a { .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-type-de-moa .field__label { display: none; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .top_bottom .block-entity-fieldnodefield-type-de-projet { + order: 3; padding-left: 1rem; padding-bottom: 1rem; border-left: 0.1rem solid; @@ -3335,15 +3401,23 @@ a { .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-images img { width: 100%; height: auto; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-date-de-parution { + order: 6; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-date-de-parution .field__label { + display: none; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-mots-clefs { - order: 6; + order: 7; display: flex; - margin-top: 2rem; + margin-top: 0.8rem; flex-direction: row; flex-wrap: wrap; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-mots-clefs .field__label { + display: none; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-mots-clefs .field__items { + display: flex; + flex-direction: row; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-mots-clefs .field__item { margin-right: 0.5rem; - padding-left: 0.3rem; padding-right: 0.3rem; font-size: 0.8rem; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--third .block-region-third .block-entity-fieldnodefield-ressource-s-liee-s- .node-type-ressource div .field--name-field-mots-clefs .field__item a { diff --git a/web/themes/custom/eql/eql.theme b/web/themes/custom/eql/eql.theme index ec41b48..66d718e 100644 --- a/web/themes/custom/eql/eql.theme +++ b/web/themes/custom/eql/eql.theme @@ -56,12 +56,19 @@ function eql_preprocess_layout__threecol_25_50_25(&$variables) { $variables['content']['top_bottom'] = []; /////// déclare les nvx array $variables['content']['top_right'] = []; $variables['content']['top_left'] = []; + $variables['content']['top_bottom_left'] = []; foreach ($variables['content']['top'] as $key => $value) { if(isset($value['#base_plugin_id']) && $value['#base_plugin_id']== 'entity_field'){ ////// isset pour voir si existe && si oui fait ce que tu as à faire. $Value c'est l'attribut - if($value['#derivative_plugin_id']=="node:field_type_de_moa" || $value['#derivative_plugin_id']=="node:field_adresse"|| $value['#derivative_plugin_id']=="node:field_type_de_projet" || $value['#derivative_plugin_id']=="node:field_etape_du_projet") { + if($value['#derivative_plugin_id']=="node:field_region" || $value['#derivative_plugin_id']=="node:field_adresse") { + $variables['content']['top_bottom_left'][] = $variables['content']['top'][$key]; + unset($variables["content"]["top"][$key]); + } + if($value['#derivative_plugin_id']=="node:field_type_de_moa" || $value['#derivative_plugin_id']=="node:field_type_de_projet" || $value['#derivative_plugin_id']=="node:field_etape_du_projet") { $variables['content']['top_bottom'][] = $variables['content']['top'][$key]; unset($variables["content"]["top"][$key]); } + // foreach ($variables['content']['top_bottom'] as $key => $value) { + // } if($value['#derivative_plugin_id']=="node:title" || $value['#derivative_plugin_id']=="node:field_equipe" || $value['#derivative_plugin_id']=="node:field_incube"){ $variables['content']['top_right'][] = $variables['content']['top'][$key]; unset($variables["content"]["top"][$key]); diff --git a/web/themes/custom/eql/scripts/main.js b/web/themes/custom/eql/scripts/main.js index 982b760..bf60448 100644 --- a/web/themes/custom/eql/scripts/main.js +++ b/web/themes/custom/eql/scripts/main.js @@ -196,8 +196,11 @@ jQuery(function($) { $('.page-node-type-projet .block-entity-fieldnodefield-photo .field--type-image').slick({ + slidesToShow: 1, dots: true, arrows: false, + draggable: true, + adaptiveHeight: true, }); console.log('salut slick projets'); diff --git a/web/themes/custom/eql/scss/pages/_home.scss b/web/themes/custom/eql/scss/pages/_home.scss index 6cd1f8e..a0a0d5e 100644 --- a/web/themes/custom/eql/scss/pages/_home.scss +++ b/web/themes/custom/eql/scss/pages/_home.scss @@ -406,6 +406,30 @@ margin-top: 0.8rem; font-size: 0.7rem; } + .field--name-field-region{ + order: 5; + color: $black; + font-size: 0.7rem; + } + .field--name-field-type-de-moa{ + order:6; + a{ + color: $black; + font-size: 0.7rem; + } + } + .field--name-field-type-de-projet{ + order:7; + a { + color: $black; + font-size: 0.7rem; + } + } + .field--name-field-etape-du-projet{ + order: 8; + color: $black; + font-size: 0.7rem; + } } } // .node-type-projet{ @@ -421,8 +445,39 @@ } } - //carte + // bouton voir tous les projets du bandeau bleu + .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f{ + display: flex; + flex-flow: row-reverse; + top: -109px; + position: relative; + right: 200px; + + .field--type-text-with-summary{ + height: fit-content; + padding: 0.4rem 1rem; + font-size: 0.8rem; + margin: 0; + background-color: $white; + border: 2px solid $blue-light; + list-style: none; + display: inline-flex; + } + a{ + text-transform: uppercase; + font-weight: 700; + color: $blue-light; + display: inline-flex; + align-items: center; + } + a::after{ + content: url('data:image/svg+xml,'); + + } + } + + //carte .block-views-blockprojets-block-2{ #leaflet-map-view-projets-block-2{ height: 500px !important; diff --git a/web/themes/custom/eql/scss/pages/_projet.scss b/web/themes/custom/eql/scss/pages/_projet.scss index f83c2fd..78957a8 100644 --- a/web/themes/custom/eql/scss/pages/_projet.scss +++ b/web/themes/custom/eql/scss/pages/_projet.scss @@ -10,10 +10,12 @@ padding-top: 4rem; margin-left: 10%; margin-right: 10%; + width: 80vw; .top_top{ display: flex; flex-direction: row; margin-bottom: 2rem; + // width: 800px; .block-entity-fieldnodefield-photo{ width: 60%; padding-right: 2rem; @@ -23,10 +25,11 @@ img{ // padding-top: 2rem; // width: 600px; - width: 65%; + // width: 65%; // height: auto; // max-height: 360px; - object-fit: cover; + object-fit: contain; + width: inherit; @media (max-width: 810px) { padding-top: 1rem; object-fit: cover; @@ -73,7 +76,7 @@ // grid-column: 8 ; width: fit-content; .field--name-field-incube{ - background-color: red; + background-color: $red; color: white; font-weight: 800; padding-right: 0.3rem; @@ -94,33 +97,62 @@ border: 0.1rem solid; justify-content: space-evenly; width: 90%; - - .block-entity-fieldnodefield-adresse{ - padding-left: 1.5rem; - // margin-block-start: .83em; + .top_bottom_left{ + padding-right: 1rem; + order: 1; + // display: grid; + // grid-template-columns: 1fr, repeat(2, 2fr); width: 30%; - .field--name-field-adresse{ - display: flex; - flex-direction: row; - margin-top: .83em; - .address{ - margin: auto; + position: relative; + &::before{ + // grid-column: 1; + // grid-row: 1 /span 2; + content: url("../images/pictos/picto_lieu.svg"); + display: inline-block; + width: 50px; + padding-right: 1rem; + position: absolute; + left: 0; + margin-top: .83em; + margin-left: 1rem; + } + .block-entity-fieldnodefield-region{ + order: 1; + margin-left: 70px; + margin-bottom: 1rem; + // grid-column: 2; + // grid-row: 1; + } + .block-entity-fieldnodefield-adresse{ + order: 2; + margin-left: 70px; + // grid-column: 2; + // grid-row: 2; + // margin-block-start: .83em; + .field--name-field-adresse{ display: flex; - flex-direction: column; - justify-content: start; - margin: 0; - // .locality::after{ - // content:","; - // margin-right: 0.3rem; - // } - } - &::before{ - content: url("../images/pictos/picto_lieu.svg"); - padding-right: 1rem; + flex-direction: row; + margin-top: .83em; + .address{ + margin: auto; + display: flex; + flex-direction: column; + justify-content: start; + margin: 0; + // .locality::after{ + // content:","; + // margin-right: 0.3rem; + // } + .country{ + display: none; + } + } + } } } .block-entity-fieldnodefield-etape-du-projet{ + order: 4; padding-left: 1rem; padding-right: 1rem; padding-bottom: 1rem; @@ -141,6 +173,7 @@ } } .block-entity-fieldnodefield-type-de-moa{ + order: 2; padding-left: 1rem; border-left: 0.1rem solid ; padding-bottom: 1rem; @@ -160,6 +193,7 @@ } } .block-entity-fieldnodefield-type-de-projet{ + order: 3; padding-left: 1rem; padding-bottom: 1rem; border-left: 0.1rem solid ; @@ -499,19 +533,31 @@ height: auto; } } - .field--name-field-mots-clefs{ + .field--name-field-date-de-parution{ order: 6; + .field__label{ + display: none; + } + } + .field--name-field-mots-clefs{ + order: 7; display: flex; - margin-top: 2rem; + margin-top: 0.8rem; flex-direction: row; flex-wrap: wrap; - + .field__label{ + display: none; + } + .field__items{ + display: flex; + flex-direction: row; + } .field__item{ margin-right: 0.5rem; - padding-left: 0.3rem; padding-right: 0.3rem; font-size: 0.8rem; + a{ background: $blue-dark; diff --git a/web/themes/custom/eql/scss/pages/_ressource.scss b/web/themes/custom/eql/scss/pages/_ressource.scss index febad87..7bf5472 100644 --- a/web/themes/custom/eql/scss/pages/_ressource.scss +++ b/web/themes/custom/eql/scss/pages/_ressource.scss @@ -5,6 +5,9 @@ .layout__region--top{ .block-region-top{ + .block-entity-fieldnodefield-images{ + display: none; + } .block-block-content4e5df355-e76c-4e44-bec0-e211d94f2640{ width: 100%; font-family: 'Source Code Pro'; diff --git a/web/themes/custom/eql/templates/layout--threecol-25-50-25.html.twig b/web/themes/custom/eql/templates/layout--threecol-25-50-25.html.twig index c2296f1..f7ca96b 100644 --- a/web/themes/custom/eql/templates/layout--threecol-25-50-25.html.twig +++ b/web/themes/custom/eql/templates/layout--threecol-25-50-25.html.twig @@ -32,6 +32,10 @@
{{content.top_bottom}} +
+ {{content.top_bottom_left}} +
+
{% endif %}