From 9a8e0f8f9ab4db97c54ab377824f8bb539d3615b Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 21 Dec 2023 16:10:31 +0100 Subject: [PATCH 1/2] Decorative picture is now aligned with the cooking advice part in produt.show --- .../views/fo/pages/products/show.blade.php | 77 ++++++++++--------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/resources/views/fo/pages/products/show.blade.php b/resources/views/fo/pages/products/show.blade.php index 59d7934..e4a54e2 100644 --- a/resources/views/fo/pages/products/show.blade.php +++ b/resources/views/fo/pages/products/show.blade.php @@ -92,45 +92,52 @@
{!! clean($productModel->cooking_advice) !!}
- {{-- INGREDIENTS --}} -
-

{{ __('Ingrédients') }}

-
-
{!! clean($productModel->ingredients) !!}
-
-
-
-
-
- {{ $productModel->range->picture_productsheet_title }} -
- {{-- NUTRITIONNAL VALUES --}} - @php - $nutrionnal_values = json_decode($productModel->nutritionnal_values); - @endphp - - - - - - - - - @foreach ($nutrionnal_values as $line) - - - - - @endforeach - -
{{ __('Valeurs nutritionnelles') }}{{ __('POUR') }} - {{ __('100g') }}
{{ $line->label }}{{ $line->value }}
+
+
+ {{ $productModel->range->picture_productsheet_title }}
+
+
+
+ {{-- INGREDIENTS --}} +
+

{{ __('Ingrédients') }}

+
+
{!! clean($productModel->ingredients) !!}
+
+
+
+
+
+ {{-- NUTRITIONNAL VALUES --}} + @php + $nutrionnal_values = json_decode($productModel->nutritionnal_values); + @endphp + + + + + + + + + @foreach ($nutrionnal_values as $line) + + + + + @endforeach + +
{{ __('Valeurs nutritionnelles') }}{{ __('POUR') }} + {{ __('100g') }}
{{ $line->label }}{{ $line->value }}
+
+
+
@if (count($otherProductModels)) From 25d9e1cac66fdbe5b92bc4c144eb4169b3383d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 22 Dec 2023 11:05:14 +0100 Subject: [PATCH 2/2] Fix commitments responsive on products.show --- resources/views/fo/pages/products/show.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/fo/pages/products/show.blade.php b/resources/views/fo/pages/products/show.blade.php index e4a54e2..a8d0be0 100644 --- a/resources/views/fo/pages/products/show.blade.php +++ b/resources/views/fo/pages/products/show.blade.php @@ -66,10 +66,10 @@
@foreach ($productModel->commitments as $commitment) @if ($commitment->published) -
+
- {{ $commitment->picture_alt }} + {{ $commitment->picture_alt }}
@endif