Merge branch 'develop' into trunk

This commit is contained in:
Noah Lancien 2026-07-07 17:18:19 +02:00
commit 92cd6153d8
4 changed files with 11 additions and 15 deletions

View file

@ -107,7 +107,7 @@
.negative-margin-sm {
padding-top: 3rem;
margin-top: -3rem;
margin-top: 0;
@include media-breakpoint-up(md) {
padding-top: 3rem;

View file

@ -1,7 +1,7 @@
@php
$items = $sections;
@endphp
@props(['onglets' => [], 'sections' => [], 'staticPageModel'])
@props(['onglets' => [], 'sections' => [], 'staticPageModel', 'encart' => false])
<section class="position-relative line-border-large" id="sortant-a-l-exterieur">
<div class="position-absolute h-100 w-100 top-0 z-0">
<div class="bg-green-wood h-100 w-100" id="demarche-bg"></div>
@ -75,6 +75,12 @@
</div>
@endforeach
</div>
@if ($encart)
<div class="mt-5">
<x-fo.breeding.section.sortant-a-l-exterieur.our-breeder-section />
</div>
@endif
</div>
</div>
</section>

View file

@ -6,16 +6,9 @@
@section('content')
<x-fo.breeding.section.header-section :staticPageModel="$staticPageModel" />
<section class="position-relative line-border-large" id="sortant-a-l-exterieur">
<x-fo.breeding.section.cahier-des-charges-section :staticPageModel="$staticPageModel" :onglets="$categoryApproachModels"
:sections="$sections" />
<x-fo.breeding.section.sortant-a-l-exterieur.galery-section :sliderImages="$sliderImages" title="{{ $staticPageModel->data['galery_title']['value'] }}" />
<div class="position-relative">
<div class="position-absolute h-100 w-100 top-0 z-0">
<div class="bg-green-wood h-100 w-100 line-border-large" id="demarche-bg"></div>
</div>
<x-fo.breeding.section.sortant-a-l-exterieur.our-breeder-section />
</div>
<x-fo.breeding.section.cahier-des-charges-section :staticPageModel="$staticPageModel" :onglets="$categoryApproachModels" :sections="$sections" encart=true/>
<x-fo.breeding.section.sortant-a-l-exterieur.galery-section :sliderImages="$sliderImages"
title="{{ $staticPageModel->data['galery_title']['value'] }}" />
</section>
{{-- <section class="pb-3 pt-5" id="breeder-map-section">
<div class="pt-5">

View file

@ -120,7 +120,6 @@
'picto_alt' => __($section_4->media_picto->alt),
'picto_title' => __($section_4->media_picto->title),
'reduction' => $reduction_4,
'btnLink' => route('fo.breeding.oui-c-est-bon'),
'reversed' => true,
])
{{-- COMPLEX FLEX ITEMS --}}
@ -149,8 +148,6 @@
'picto_alt' => __($section_5->media_picto->alt),
'picto_title' => __($section_5->media_picto->title),
'reduction' => $reduction_5,
'btnLabel' => str(__('découvrir la démarche'))->upper(),
'btnLink' => route('fo.breeding.sortant-a-l-exterieur'),
'reversed' => true,
])
{{-- COMPLEX FLEX ITEMS --}}