forge-joniko/ldc-le-gaulois-pro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Vincent BRIDIER 2023-08-24 11:44:31 +02:00
commit da3b6203cd
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/ts/components/fo/ContactListProducts.vue
View file

@ -4,7 +4,7 @@
>
<div v-if="basket.length <= 0">
<span class="h4">
{{ __("Vous n'avez aucun produits dans votre panier.") }}
{{ __("Vous n'avez aucun produits dans votre demande de contact.") }}
</span>
</div>
<div
@ -119,7 +119,7 @@ export default defineComponent({
.post(removeProductRoute)
.then((data) => {
this.basket = data.data.sessionProducts;
this.notify(this.__("Ce produit a bien été supprimé de votre panier"));
this.notify(this.__("Ce produit a bien été supprimé de votre demande de contact."));
document
.querySelectorAll(".counter-wrapper")
.forEach((value: Element) => {

12
resources/views/fo/modules/flashMessage.blade.php
View file

@ -11,7 +11,7 @@
</svg>
@if ($message = Session::get('success'))
<div class="alert alert-success d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-success d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Success:"><use xlink:href="#check-circle-fill"/></svg>
<strong>{!! nl2br(e($message)) !!}</strong>
<button type="button" class="btn btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@ -19,7 +19,7 @@
@endif
@if ($message = Session::get('error'))
<div class="alert alert-danger d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-danger d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Danger:"><use xlink:href="#exclamation-triangle-fill"/></svg>
<strong>{!! nl2br(e($message)) !!}</strong>
<button type="button" class="btn btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@ -28,7 +28,7 @@
@if ($message = Session::get('warning'))
<div class="alert alert-warning d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-warning d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Warning:"><use xlink:href="#exclamation-triangle-fill"/></svg>
<strong>{!! nl2br(e($message)) !!}</strong>
<button type="button" class="btn btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@ -37,7 +37,7 @@
@if ($message = Session::get('info'))
<div class="alert alert-info d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-info d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Info:"><use xlink:href="#info-fill"/></svg>
<strong>{!! nl2br(e($message)) !!}</strong>
<button type="button" class="btn btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@ -45,7 +45,7 @@
@endif
@if ($message = Session::get('message'))
<div class="alert alert-info d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-info d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Info:"><use xlink:href="#info-fill"/></svg>
<strong>{!! nl2br(e($message)) !!}</strong>
<button type="button" class="btn btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@ -54,7 +54,7 @@
@if ($errors->any())
<div class="alert alert-danger d-flex align-items-center alert-dismissible fade show mt-3 mb-0" role="alert">
<div class="alert alert-danger d-flex align-items-center alert-dismissible fade show mt-6 mb-0" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Danger:"><use xlink:href="#exclamation-triangle-fill"/></svg>
@if ($errors->any())
<ul class="list-unstyled">

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

11
resources/views/fo/pages/home.blade.php
View file

@ -470,10 +470,13 @@
<div class="card text-center h-100">
<img src="{{ asset('build/assets/images/homepage/mieux-vivre.svg') }}" class="card-img-top mx-auto" alt="Deux mains qui vont se rejoindre">
<div class="card-body h-100 d-flex flex-column mt-4">
<h3 class="card-title d-flex justify-content-center align-items-center h3">{{ __('Respecter la Terr') }}e</h3>
<p class="card-text d-flex">{{ __('Face aux enjeux d\'aujourd\'hui, nous mettons tout en oeuvre pour limiter notre impact environnemental. <br>
Ainsi notre empreinte carbone a été réduite de 17% en 3 ans grace notamment à une attention portée sur le transport de nos
volailles et marchandises, nos emballages, nos fournisseurs etc.') }}</p>
<h3 class="card-title d-flex justify-content-center align-items-center h3">{{ __('Respecter la Terre') }}</h3>
<p class="card-text d-flex">
{{ __('Face aux enjeux d\'aujourd\'hui, nous mettons tout en oeuvre pour limiter notre impact environnemental.')}}
<br>
{{ __('Ainsi notre empreinte carbone a été réduite de 17% en 3 ans grace notamment à une attention portée sur le transport de nos
volailles et marchandises, nos emballages, nos fournisseurs etc.') }}
</p>
</div>
</div>
</div>

2
resources/views/fo/pages/ideas/tips.blade.php
View file

@ -32,7 +32,7 @@
'type' => 'advice',
'color' => 'blue',
'title' => $advice->title,
'text' => $advice->preparation,
'text' => strip_tags($advice->preparation),
'picture' => $advice->picture,
'picture_alt' => $advice->picture_alt,
'picture_title' => $advice->picture_title,