From 03370aae78b03e5dc3bdb2453bf444b4be6ae125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 5 Aug 2022 15:34:44 +0200 Subject: [PATCH] multiple fixes --- resources/js/pages/poultry-show.js | 4 +- resources/sass/_variables.scss | 12 +++- resources/sass/front/pages/_poultry_show.scss | 8 +-- resources/views/front/breeders/show.blade.php | 62 +++++++++---------- .../views/front/poultry/food/lr.blade.php | 2 +- .../poultry/parts/alimentation/lr.blade.php | 2 +- .../poultry/parts/distribution.blade.php | 2 +- 7 files changed, 45 insertions(+), 47 deletions(-) diff --git a/resources/js/pages/poultry-show.js b/resources/js/pages/poultry-show.js index eb84621..04d4085 100644 --- a/resources/js/pages/poultry-show.js +++ b/resources/js/pages/poultry-show.js @@ -57,9 +57,7 @@ document.addEventListener('DOMContentLoaded', () => { behavior: "smooth" }) } - - - if (orderNum.imask.value !== orderNum.dataset.orderNumber) { + if (orderNum.imask.value.slice(0, -5) !== orderNum.dataset.orderNumber) { orderInvalid.classList.add('d-block') orderExp.classList.add('d-none') orderNum.imask.masked.reset() diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 1bdeafd..efb7128 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -1,10 +1,16 @@ $boMenuHeigth: 3rem; $boDarkBg: rgb(55, 55, 55); -$greyBG: darken($color:gray, $amount: 10); -$breedingGreen: darken($color:#78ba56, $amount: 17.7); +$greyBG: darken( + $color: #a9afac, + $amount: 10, +); +$breedingGreen: darken( + $color: #78ba56, + $amount: 17.7, +); $purpleInfo: #282649; -$bgSalmon :#ffe8cd; +$bgSalmon: #ffe8cd; $beaGreen: #008c35; $foodYellow: #f7bc3d; $contactRed: #e62a30; diff --git a/resources/sass/front/pages/_poultry_show.scss b/resources/sass/front/pages/_poultry_show.scss index ba0ff01..22c9532 100644 --- a/resources/sass/front/pages/_poultry_show.scss +++ b/resources/sass/front/pages/_poultry_show.scss @@ -25,13 +25,13 @@ & > span { position: absolute; top: -0.4rem; - right: 31%; + right: 32.5%; transform: translateX(100%) translateY(0%); - font-size: 21vw; + font-size: 5rem; font-weight: bold; font-family: Arial, Helvetica, sans-serif; - @include media-breakpoint-up(sm) { - font-size: 8rem; + @media (max-width: 360px) { + font-size: 21vw !important; } } } diff --git a/resources/views/front/breeders/show.blade.php b/resources/views/front/breeders/show.blade.php index 8167d4b..018bb8b 100644 --- a/resources/views/front/breeders/show.blade.php +++ b/resources/views/front/breeders/show.blade.php @@ -72,42 +72,36 @@ $previousUrl = session()->get('poultrySearch.model') ? route('poultry.show') : r @if($breeder->issue_1 or $breeder->issue_2) -
-
-
- - - {{ __('Question') }} - - 1 / 2 - +
+
+ + + {{ __('Question') }} + + 1 / 2 - -
-
-
- @if($breeder->issue_1) -
- - {{ __('Question 1') }} - - - {{ $breeder->issue_1 }} - -
- @endif - @if($breeder->issue_2) -
- - {{ __('Qu’est-ce qui vous plaît votre métier d’éleveur(se) de volailles de Loué ?') }} - - - {{ $breeder->issue_2 }} - -
- @endif -
+ + +
+
+
+ @if($breeder->issue_1) +
+ + {{ __('Question 1') }} + + + {{ $breeder->issue_1 }} +
+ @endif + @if($breeder->issue_2) +
+ + {{ $breeder->issue_2 }} + +
+ @endif
diff --git a/resources/views/front/poultry/food/lr.blade.php b/resources/views/front/poultry/food/lr.blade.php index 20ce260..8dd7102 100644 --- a/resources/views/front/poultry/food/lr.blade.php +++ b/resources/views/front/poultry/food/lr.blade.php @@ -46,7 +46,7 @@ $previousUrl = session()->get('poultrySearch.model') ? route('poultry.show') : r
-

{{ __('De l\'éleveur lui-même. Il cultive les céréales qui seront ensuite envoyées à l\'usine d\'aliments de la coopérative des Fermiers de Loué, ALIFEL, pour les transformer en alimentation pour poulets, qui sera ensuite retournée à l\éleveur.') }}

+

{{ __('De l\'éleveur lui-même. Il cultive les céréales qui seront ensuite envoyées à l\'usine d\'aliments de la coopérative des Fermiers de Loué, ALIFEL, pour les transformer en alimentation pour poulets, qui sera ensuite retournée à l\'éleveur.') }}

diff --git a/resources/views/front/poultry/parts/alimentation/lr.blade.php b/resources/views/front/poultry/parts/alimentation/lr.blade.php index 46d0f4b..e3b6c54 100644 --- a/resources/views/front/poultry/parts/alimentation/lr.blade.php +++ b/resources/views/front/poultry/parts/alimentation/lr.blade.php @@ -19,7 +19,7 @@

{{ - __('ALIFEL est l\'usine dédié aux volailles de Loué Label Rouge pour des almiments sûrs et sains.') + __('ALIFEL est l\'usine dédiée aux volailles de Loué Label Rouge pour des aliments sûrs et sains.') }}

diff --git a/resources/views/front/poultry/parts/distribution.blade.php b/resources/views/front/poultry/parts/distribution.blade.php index 263e682..ce4e45e 100644 --- a/resources/views/front/poultry/parts/distribution.blade.php +++ b/resources/views/front/poultry/parts/distribution.blade.php @@ -21,7 +21,7 @@
- + @include('back.modules.input-error', ['inputName' => 'order_num'])
{{ __('Numéro de commande invalide') }}