Merge branch 'issue-52' into 'develop'

Issue 52, 53, 54, 55, 56 - Typos + footer link

See merge request ldc-web/projets/agis!21
This commit is contained in:
Vincent BRIDIER 2024-01-26 11:12:29 +00:00
commit ae4ab562dc
3 changed files with 22 additions and 16 deletions

View file

@ -2,19 +2,19 @@
<div class="container-fluid">
<div class="row">
<div class="col-3 d-none d-lg-block text-end">
@if(!empty($randomStampsFooter) && isset($randomStampsFooter[0]))
@if (!empty($randomStampsFooter) && isset($randomStampsFooter[0]))
<img class="img-fluid" src="{{ asset($randomStampsFooter[0]->picture) }}"
title="{{ __($randomStampsFooter[0]->picture_title) }}" alt="{{ __($randomStampsFooter[0]->picture_alt) }}" />
title="{{ __($randomStampsFooter[0]->picture_title) }}" alt="{{ __($randomStampsFooter[0]->picture_alt) }}" />
@endif
</div>
<div class="col-12 col-lg-6 footer-header text-center">
<div class="h1 text-uppercase f-sheldon">{{ __('Envie d\'exploration') }}</div>
<div class="h1 text-uppercase f-sheldon">{{ __('Envie d\'exploration') }}&nbsp;?</div>
<div class="h2 text-uppercase f-sheldon">{{ __('Suivez-nous sur') }}</div>
</div>
<div class="col-3 d-none d-lg-block text-start">
@if(!empty($randomStampsFooter) && isset($randomStampsFooter[1]))
@if (!empty($randomStampsFooter) && isset($randomStampsFooter[1]))
<img class="img-fluid" src="{{ asset($randomStampsFooter[1]->picture) }}"
title="{{ __($randomStampsFooter[1]->picture_title) }}" alt="{{ __($randomStampsFooter[1]->picture_alt) }}" />
title="{{ __($randomStampsFooter[1]->picture_title) }}" alt="{{ __($randomStampsFooter[1]->picture_alt) }}" />
@endif
</div>
</div>
@ -73,9 +73,15 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link text-uppercase cn-cookie-link py-1"
data-bs-toggle="tooltip" href="#" title="{{ __('Gestion des cookies') }}">
{{ __('cookie-notice.button_customize_cookies') }}
<a class="nav-link text-uppercase @if (request()->routeIs('fo.convictions')) active @endif py-1" data-bs-toggle="tooltip"
href="{{ route('fo.convictions') }}" title="{{ __('Nos convictions') }}">
{{ __('Nos convictions') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-uppercase @if (request()->routeIs('fo.news.*')) active @endif py-1" data-bs-toggle="tooltip"
href="{{ route('fo.news.index') }}" title="{{ __('Actualités') }}">
{{ __('Actualités') }}
</a>
</li>
<li class="nav-item">
@ -83,12 +89,6 @@
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link text-uppercase @if (request()->routeIs('fo.news.*')) active @endif py-1" data-bs-toggle="tooltip"
href="{{ route('fo.news.index') }}" title="{{ __('Actualités') }}">
{{ __('Actualités') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-uppercase @if (request()->routeIs('fo.joinus.show')) active @endif py-1" data-bs-toggle="tooltip"
href="{{ route('fo.joinus.show') }}" title="{{ __('Rejoignez-nous') }}">
@ -113,6 +113,12 @@
{{ __('Mentions légales') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-uppercase cn-cookie-link py-1" data-bs-toggle="tooltip" href="#"
title="{{ __('Gestion des cookies') }}">
{{ __('cookie-notice.button_customize_cookies') }}
</a>
</li>
<li class="nav-item">
<span class="d-lg-none">&nbsp;-&nbsp;</span>
</li>

View file

@ -6,7 +6,7 @@
width="200">
</a>
<span class="center-main-menu-text h6 text-uppercase d-none d-sm-flex">{{ __('Crée & préparé avec passion') }}</span>
<span class="center-main-menu-text h6 text-uppercase d-none d-sm-flex">{{ __('Créé & préparé avec passion') }}</span>
<button class="navbar-toggler border-0" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-nav-menu" type="button"
aria-controls="offcanvas-nav-menu">

View file

@ -20,7 +20,7 @@
</div>
<div class="col-12">
<p class="lh-sm fw-bold m-0 text-center">
{{ Str::of(__('de l\'appéritif au repas, en solo, entre amis ou en familles, découvrez nos délicieuses recettes.'))->ucFirst() }}
{{ Str::of(__('de l\'apéritif au repas, en solo, entre amis ou en famille, découvrez nos délicieuses recettes.'))->ucFirst() }}
</p>
</div>
<div class="col-12 d-flex justify-content-center my-4">