Merge branch 'develop' into trunk

This commit is contained in:
Noah Lancien 2025-09-18 09:24:06 +02:00
commit 342dca63a3
3 changed files with 22 additions and 16 deletions

3
.gitignore vendored
View file

@ -23,6 +23,9 @@ Homestead.yaml
npm-debug.log
yarn-error.log
.npmrc
.zshrc
.npm/
.composer/
# Ignore public favicon
/public/android-chrome-192x192.png

View file

@ -26,11 +26,9 @@
@if (
!is_null(request()->route()) &&
!in_array(request()->route()->getName(),
['fo.homepage', 'fo.tips.show', 'fo.recipes.show']))
['fo.homepage', 'fo.tips.show', 'fo.recipes.show', 'fo.news.show']))
@if (request()->route()->getName() == 'fo.product.show')
<div class="wrapper-xxl px-lg-5 px-xxl-10 mt-6 px-0">
@elseif (request()->route()->getName() == 'fo.news.show')
<div class="mt-2 d-flex justify-content-start ms-4">
@else
<div class="mt-6">
@endif

View file

@ -1,4 +1,4 @@
@extends('fo.layout', ['brParam' => $news])
@extends('fo.layout')
@section('title', $news->seo_title)
@section('description', $news->seo_description)
@ -23,22 +23,27 @@
</div>
</div>
</div>
<div class="ck-content col-12 col-md-6 d-flex flex-column justify-content-center align-items-center text-md-start px-md-0 pe-md-4 pe-lg-6 pe-xl-8 text-center">
<div class="col-12 col-md-6 d-flex flex-column justify-content-center align-items-center text-md-start px-md-0 pe-md-4 pe-lg-6 pe-xl-8 text-center">
<div class="w-100 mb-md-5 mb-4 px-3">
<div class="row">
<div class="col d-flex flex-column justify-content-between align-items-center">
<div class="row title-wrapper my-3">
<h1 class="h1 text-center">{{ $news->title }}</h1>
<div class="mt-6 d-flex justify-content-end ms-4">
@include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $news] )
</div>
<div class="prod-tags mb-4">
@foreach ($news->categories as $category)
<div class="category-wrapper d-inline-block bg-color-blue rounded-3 px-4 py-1">
<span class="ff-poppins-regular fs-xsm">{{ $category->label }}</span>
</div>
@endforeach
</div>
<div class="paragraph-format mb-md-5 mb-4 text-center">
<p>{{ $news->subtitle }}</p>
<div class="ck-content">
<div class="row title-wrapper my-3">
<h1 class="h1 text-center">{{ $news->title }}</h1>
</div>
<div class="prod-tags mb-4">
@foreach ($news->categories as $category)
<div class="category-wrapper d-inline-block bg-color-blue rounded-3 px-4 py-1">
<span class="ff-poppins-regular fs-xsm">{{ $category->label }}</span>
</div>
@endforeach
</div>
<div class="paragraph-format mb-md-5 mb-4 text-center">
<p>{{ $news->subtitle }}</p>
</div>
</div>
</div>
</div>