diff --git a/app/Http/Controllers/Fo/CommitmentController.php b/app/Http/Controllers/Fo/CommitmentController.php index 555883dd..4ea9aa90 100644 --- a/app/Http/Controllers/Fo/CommitmentController.php +++ b/app/Http/Controllers/Fo/CommitmentController.php @@ -20,6 +20,7 @@ class CommitmentController extends Controller ->map(fn($page) => [ 'title' => $page->type->label(), 'picto' => $page->data['picto_navigation'] ?? null, + 'activePicto' => $page->data['picto_banner'] ?? null, 'type' => $page->type->value, 'link' => route($page->type->routeForCommitments()), ]) diff --git a/resources/sass/fo/base/_common.scss b/resources/sass/fo/base/_common.scss index 107f303b..0b142624 100644 --- a/resources/sass/fo/base/_common.scss +++ b/resources/sass/fo/base/_common.scss @@ -201,6 +201,7 @@ left: 0; width: 100%; height: 100%; + background-color: #fcf8f7; background-image: url('@/images/common/wood-bg-white-big.jpg'); background-position: left; background-repeat: no-repeat; diff --git a/resources/sass/fo/pages/commitments.scss b/resources/sass/fo/pages/commitments.scss index 000daf16..3fe61a58 100644 --- a/resources/sass/fo/pages/commitments.scss +++ b/resources/sass/fo/pages/commitments.scss @@ -98,6 +98,10 @@ margin-bottom: 0.75rem; } +.content-beige p { + margin-bottom: 0; +} + #commitments-arrows-list { padding-bottom: 12rem; diff --git a/resources/views/fo/layouts/header-banner.blade.php b/resources/views/fo/layouts/header-banner.blade.php index 0ffd0e4b..521af6a6 100644 --- a/resources/views/fo/layouts/header-banner.blade.php +++ b/resources/views/fo/layouts/header-banner.blade.php @@ -7,7 +7,7 @@
@include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $staticPageModel]) -
+
@if (isset($badge) && !empty($badge))
{{ $badge->label }} diff --git a/resources/views/fo/pages/commitments/raise.blade.php b/resources/views/fo/pages/commitments/raise.blade.php index 52ac9bae..ca531919 100644 --- a/resources/views/fo/pages/commitments/raise.blade.php +++ b/resources/views/fo/pages/commitments/raise.blade.php @@ -184,6 +184,7 @@ ]) @endif {{-- COMPLEX FLEX ITEMS --}} +
@if ($section_7_model->visibility) @include('fo.partials.commitments.complex-flex-items', [ 'title' => str($section_7->title->value)->upper(), diff --git a/resources/views/fo/partials/commitments/complex-flex-items.blade.php b/resources/views/fo/partials/commitments/complex-flex-items.blade.php index 10030165..3bf7b899 100644 --- a/resources/views/fo/partials/commitments/complex-flex-items.blade.php +++ b/resources/views/fo/partials/commitments/complex-flex-items.blade.php @@ -7,7 +7,9 @@

{{ $title }}

@if (isset($subtitle)) -

{{ $subtitle }}

+
+ {!! clean($subtitle) !!} +
@endif
@@ -30,7 +32,7 @@ @endif
{{ $item->title }}
@if (isset($item->description)) -

{!! clean($item->description) !!}

+ {!! clean($item->description) !!} @endif
diff --git a/resources/views/fo/partials/commitments/navigation.blade.php b/resources/views/fo/partials/commitments/navigation.blade.php index 6ed04a6b..7bfaeb34 100644 --- a/resources/views/fo/partials/commitments/navigation.blade.php +++ b/resources/views/fo/partials/commitments/navigation.blade.php @@ -4,6 +4,10 @@
@foreach ($commitmentModels as $commitmentModel) + @php + $isCurrentPage = url()->current() === $commitmentModel['link']; + $picto = $isCurrentPage ? $commitmentModel['picto']['value'] : $commitmentModel['activePicto']['value']; + @endphp !$loop->last, 'pt-1 pb-2 pb-md-1' => $loop->last, ])> - {{ $commitmentModel['picto']['alt'] ?? '' }} + {{ $commitmentModel['picto']['alt'] ?? '' }} @endforeach
diff --git a/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php b/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php index 1fdcd7ef..9431eb0c 100644 --- a/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php +++ b/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php @@ -6,7 +6,7 @@ $articleId = $reduction->article_id->value ?? null; $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; @endphp -
+

{{ $title }}

-

{!! clean($text) !!}

+ {!! clean($text) !!}
+@if (isset($ctaUrl) || isset($articleId))
@include('fo.partials.block.reduction-card', [ 'news' => $reductionNews, @@ -27,4 +28,5 @@ 'blockType' => $blockType, ])
+@endif