diff --git a/web/themes/custom/caravane/assets/js/stores/content.js b/web/themes/custom/caravane/assets/js/stores/content.js index 7848eff..25861cb 100644 --- a/web/themes/custom/caravane/assets/js/stores/content.js +++ b/web/themes/custom/caravane/assets/js/stores/content.js @@ -70,7 +70,7 @@ export const useContentStore = defineStore('content', { - if (this.contentType !== 'gouvernance' && this.contentType !== 'partenaire') { + if (this.contentType !== 'gouvernance' && this.contentType !== 'partenaire') { // pageTitle for (let tag of rawContent.attributes.metatag) { if (tag.tag === "meta") { @@ -177,6 +177,7 @@ export const useContentStore = defineStore('content', { alt: partie.relationships.field_diaporama.data[index].meta.alt, }); } + } break; case 'entretien': @@ -235,7 +236,7 @@ export const useContentStore = defineStore('content', { `${introContent.attributes.field_titre} ${introContent.attributes.metatag.find(tag => tag.tag === "meta")?.attributes.content}`; this.content.contentTitle = introContent.attributes.field_titre; - this.content.intro = introContent.attributes.field_intro.value; + this.content.intro = introContent.attributes.field_intro?.value; const multiItemPageArray = []; diff --git a/web/themes/custom/caravane/assets/scss/main.scss b/web/themes/custom/caravane/assets/scss/main.scss index 0819cb8..c0e3882 100644 --- a/web/themes/custom/caravane/assets/scss/main.scss +++ b/web/themes/custom/caravane/assets/scss/main.scss @@ -1105,26 +1105,29 @@ body{ > #partenaires { margin-top: 3vh; > div.intro { - margin-bottom: 6vh; + margin-bottom: 4vh; @media screen and (min-width: $desktop-min-width) { } } > div.equipe-item { @media screen and (min-width: $desktop-min-width) { - margin-bottom: 7vh; + margin-bottom: 5vh; } > .partie-title { - margin-bottom: 3vh; + margin-bottom: 1.5vh; } } > div.equipe-item > div.personne, > div.partenaire { display: grid; - grid-template-columns: 0.4fr 1fr; - column-gap: 3rem; + grid-template-columns: 0.3fr 1fr; + column-gap: 2rem; grid-template-rows: auto; justify-items: start; - margin-bottom: 6vh; + margin-bottom: 3vh; + @media screen and (min-width: $desktop-min-width) { + grid-template-columns: 0.15fr 1fr; + } > figure { grid-column: 1; grid-row: 1 / span 2;