From 0667b7c792b9bf4d8e8b3576bbe4be3c1d2f9fa2 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Fri, 14 Oct 2022 17:11:21 +0200 Subject: [PATCH] =?UTF-8?q?troisi=C3=A8me=20retours?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sable/breadcrumb/breadcrumb-body.blade.php | 6 +++--- .../sable/breadcrumb/breadcrumb-head.blade.php | 2 +- resources/views/front/sable/contact.blade.php | 2 ++ resources/views/front/sable/faq.blade.php | 2 ++ resources/views/front/sable/home.blade.php | 6 +++--- .../sable/js/components/FilterComponent.vue | 16 ++++++++-------- .../views/front/sable/legal-notice.blade.php | 2 ++ resources/views/front/sable/privacy.blade.php | 2 ++ .../views/front/sable/sass/fo/base/_common.scss | 15 +++++++++++++++ .../views/front/sable/sass/fo/pages/_home.scss | 4 ---- resources/views/front/sable/terms.blade.php | 2 ++ 11 files changed, 40 insertions(+), 19 deletions(-) diff --git a/resources/views/front/sable/breadcrumb/breadcrumb-body.blade.php b/resources/views/front/sable/breadcrumb/breadcrumb-body.blade.php index eaf2c44a..97b0c0e3 100644 --- a/resources/views/front/sable/breadcrumb/breadcrumb-body.blade.php +++ b/resources/views/front/sable/breadcrumb/breadcrumb-body.blade.php @@ -1,7 +1,7 @@ @hasSection('breadcrumb') -@if(Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) - {{ Breadcrumbs::render(app()->view->getSections()['breadcrumb'], $brParam ?? null) }} -@endif + @if(Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) + {{ Breadcrumbs::render(app()->view->getSections()['breadcrumb'], $brParam ?? null) }} + @endif @elseif(Breadcrumbs::exists(request()->route()->getName())) {{ Breadcrumbs::render(request()->route()->getName()) }} @endif diff --git a/resources/views/front/sable/breadcrumb/breadcrumb-head.blade.php b/resources/views/front/sable/breadcrumb/breadcrumb-head.blade.php index 87845d74..d4a4abfc 100644 --- a/resources/views/front/sable/breadcrumb/breadcrumb-head.blade.php +++ b/resources/views/front/sable/breadcrumb/breadcrumb-head.blade.php @@ -1,6 +1,6 @@ @hasSection('breadcrumb') @if(Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) - {{ Breadcrumbs::view('breadcrumbs::json-ld', app()->view->getSections()['breadcrumb'], $brParam ?? null) }} + {{ Breadcrumbs::view('breadcrumbs::json-ld', app()->view->getSections()['breadcrumb'], $brParam ?? null) }} @endif @elseif(Breadcrumbs::exists(request()->route()->getName())) {{ Breadcrumbs::view('breadcrumbs::json-ld', request()->route()->getName()) }} diff --git a/resources/views/front/sable/contact.blade.php b/resources/views/front/sable/contact.blade.php index f7028d3f..c4aea861 100644 --- a/resources/views/front/sable/contact.blade.php +++ b/resources/views/front/sable/contact.blade.php @@ -3,6 +3,8 @@ @section('title', __('Contactez-nous')) @section('description', 'Procédure afin de contacter les gérants de la boutique.') +@section('breadcrumb', 'no') + @section('content')

{!! $content->title !!}

diff --git a/resources/views/front/sable/faq.blade.php b/resources/views/front/sable/faq.blade.php index b754fadc..553d1422 100644 --- a/resources/views/front/sable/faq.blade.php +++ b/resources/views/front/sable/faq.blade.php @@ -3,6 +3,8 @@ @section('title', __('FAQ')) @section('description', 'Foire aux questions fréquemment posées.') +@section('breadcrumb', 'no') + @section('content')
diff --git a/resources/views/front/sable/home.blade.php b/resources/views/front/sable/home.blade.php index e3a4b9f1..43da3a43 100644 --- a/resources/views/front/sable/home.blade.php +++ b/resources/views/front/sable/home.blade.php @@ -37,14 +37,14 @@ picture) }}" class="h-100 mw-100" alt="{{ $product->name }}">
-
+
{{ $product->name }}
-
+
@if ($product->promotions->count()) @fmt_currency_without_ttc($product->priceTtc) @endif - @fmt_currency_without_ttc($product->discountedPriceTtc) @fmt_sellunit($product->sell_unit) + @fmt_currency_without_ttc($product->discountedPriceTtc)
@if ($product->weight_variable)

*Prix variable en fonction du poids

diff --git a/resources/views/front/sable/js/components/FilterComponent.vue b/resources/views/front/sable/js/components/FilterComponent.vue index 1432a43f..2bd783ea 100644 --- a/resources/views/front/sable/js/components/FilterComponent.vue +++ b/resources/views/front/sable/js/components/FilterComponent.vue @@ -141,21 +141,21 @@ :key="productIndex" class="col-lg-4 card rounded-4 px-0 py-2 p-lg-1 p-xl-3 m-0" v-bind:class="[!product.availability ? 'card-available-soon' : '']"> -
-
-
+
+
+

bientôt disponible

- +
-
-
+
+
{{ product.name }}
-

+
- {{ currencyFormatter(product.discountedPriceTtc) }} / {{ product.sell_unit }} + {{ currencyFormatter(product.discountedPriceTtc) }} {{ currencyFormatter(product.priceTtc) }}

*Prix variable en fonction du poids

diff --git a/resources/views/front/sable/legal-notice.blade.php b/resources/views/front/sable/legal-notice.blade.php index 59595d6e..8ad4ba64 100644 --- a/resources/views/front/sable/legal-notice.blade.php +++ b/resources/views/front/sable/legal-notice.blade.php @@ -3,6 +3,8 @@ @section('title', __('Mentions légales & CGU')) @section('description', 'Mentions légales et conditions générales d\'utilisations de la boutique.') +@section('breadcrumb', 'no') + @section('content')
diff --git a/resources/views/front/sable/privacy.blade.php b/resources/views/front/sable/privacy.blade.php index 2f72420c..d76df556 100644 --- a/resources/views/front/sable/privacy.blade.php +++ b/resources/views/front/sable/privacy.blade.php @@ -3,6 +3,8 @@ @section('title', __('Politique de confidentialité')) @section('description', 'Politique de confidentialité de la boutique.') +@section('breadcrumb', 'no') + @section('content')
diff --git a/resources/views/front/sable/sass/fo/base/_common.scss b/resources/views/front/sable/sass/fo/base/_common.scss index 43651fdb..ce3cf5ac 100644 --- a/resources/views/front/sable/sass/fo/base/_common.scss +++ b/resources/views/front/sable/sass/fo/base/_common.scss @@ -35,6 +35,21 @@ img { } } + &-body { + min-height: 50%; + + .fst-italic { + font-size: .8em; + } + } + + &-text p { + margin: 0; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + &-activate { .filtre, .bkg-medium-grey { diff --git a/resources/views/front/sable/sass/fo/pages/_home.scss b/resources/views/front/sable/sass/fo/pages/_home.scss index f070411a..e7f1110d 100644 --- a/resources/views/front/sable/sass/fo/pages/_home.scss +++ b/resources/views/front/sable/sass/fo/pages/_home.scss @@ -143,10 +143,6 @@ max-width: 100%; } - &-slide { - padding-bottom: 2rem; - } - &-button { &-next, &-prev { width: 2rem; diff --git a/resources/views/front/sable/terms.blade.php b/resources/views/front/sable/terms.blade.php index 554b6395..b9877f88 100644 --- a/resources/views/front/sable/terms.blade.php +++ b/resources/views/front/sable/terms.blade.php @@ -3,6 +3,8 @@ @section('title', __('CGV')) @section('description', 'Conditions générales de ventes de la boutique.') +@section('breadcrumb', 'no') + @section('content')