diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index 1204386..fc9a413 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -22,11 +22,10 @@ body { } } - .rest-in-game-banner { transform: skew(12deg) translateX(5%); - >span { + >div, >span { transform: skew(-12deg); } } @@ -47,6 +46,10 @@ body { transform: translateY(-50%); } } + + .img-wrapper { + aspect-ratio: 4/3; + } } > footer { diff --git a/sass/mail-theme.scss b/sass/mail-theme.scss index 6adfa17..a9adb2e 100644 --- a/sass/mail-theme.scss +++ b/sass/mail-theme.scss @@ -138,7 +138,7 @@ p { /* Logo */ .logo { - width: 75px; + width: auto; height: 75px; max-height: 75px; } diff --git a/sass/pages/_static_page.scss b/sass/pages/_static_page.scss index 8baf53b..1eea8c6 100644 --- a/sass/pages/_static_page.scss +++ b/sass/pages/_static_page.scss @@ -1,18 +1,18 @@ .static-page { h1 { - color: $color-quint; + color: $color-primary; text-align: center; text-transform: uppercase; } h2,h3,h4,h5,h6 { - color: $color-quad; + color: $color-secondary; text-transform: uppercase; } hr { width: 30%; - border-top: 0.2rem solid #{$color-quad}; + border-top: 0.2rem solid #{$color-secondary}; margin: 0 auto; } -} \ No newline at end of file +} diff --git a/theme.config.php b/theme.config.php index 0f25ddd..e763ab2 100644 --- a/theme.config.php +++ b/theme.config.php @@ -23,7 +23,7 @@ return [ // * Image resizer config /** * Format can specifiy to which format save the image - * JPEG PNG GIF TIF BMP ICO PSD WebP + * JPG PNG GIF TIF BMP ICO PSD WebP * GD ✔️ ✔️ ✔️ - - - - ✔️ * * Imagick ✔️ ✔️ ✔️ ✔️ ✔️ ✔️ ✔️ ✔️ * * For WebP support GD driver must be used with PHP 5 >= 5.5.0 or PHP 7 @@ -67,6 +67,15 @@ return [ 'inCanvas' => true, 'trim' => ['transparent', null, 10], 'format' => 'png' - ] + ], + 'scratch_prize' => [ + 'width' => 570, + 'height' => 350, + 'resize' => true, + 'inCanvas' => true, + 'keepRatio' => true, + 'trim' => ['transparent', null, 10], + 'format' => 'png' + ], ] ]; diff --git a/views/layouts/header.blade.php b/views/layouts/header.blade.php index fad6bae..834dec4 100644 --- a/views/layouts/header.blade.php +++ b/views/layouts/header.blade.php @@ -55,13 +55,20 @@ {{ __("Encore\u{00A0}en\u{00A0}jeu\u{00A0}:") }} @if (Arr::has($prizesGlobal, 0)) - - +
+
+ {{ Arr::get($prizesGlobal, 0)->picture_alt }} +
+ {{ Arr::get($prizesGlobal, 0)->instantWins->where('prize_id', 1)->whereNull('participation_id')->count() ?? 0 }} {{ Arr::get($prizesGlobal, 0)->label }} - +
@endif diff --git a/views/pages/home.blade.php b/views/pages/home.blade.php index c3fc8be..aaf2867 100644 --- a/views/pages/home.blade.php +++ b/views/pages/home.blade.php @@ -44,7 +44,7 @@ {{ Arr::get($prizesGlobal, 0)->label }} @endif -

{{ __('Et des milliers de bon d’achat') }}

+

{{ __('Et des milliers de bon d\'achat') }}

@endif {{-- @if (Arr::has($prizesGlobal, 1)) @@ -168,7 +168,7 @@
-
- {{ __("Félicitations\u{00A0}!") }} +
+ {{ __("Félicitations\u{00A0}!") }}

- {{ __('Vous avez gagné un bon d\'achat de :amount € sur :product_name', [ - 'amount' => number_format($discount->face_value / 100, 2, ','), - 'product_name' => $discount->valid_on, - ]) }} + {{ __('Vous avez gagné un bon d\'achat de :amount €', ['amount' => number_format($discount->face_value / 100, 2, ',')]) }}

diff --git a/views/pages/participation/parts/prize.blade.php b/views/pages/participation/parts/prize.blade.php index 7066ea3..d3e3463 100644 --- a/views/pages/participation/parts/prize.blade.php +++ b/views/pages/participation/parts/prize.blade.php @@ -19,7 +19,7 @@ 'text-bg-primary' => $prizeModel->id % 2 === 1, 'text-bg-tertiary' => $prizeModel->id % 2 === 0, ])> - {{ __("Félicitations\u{00A0}!") }} + {{ __("Félicitations\u{00A0}!") }}

{{ __('Vous avez gagné un :model !', [ 'model' => $prizeModel->label, @@ -28,11 +28,11 @@ @if ($settingsGlobal->winning_proof) {{ __('Pour recevoir votre cadeau, vous devez envoyer vos preuves d\'achat. Voir modalités ci dessous.') }} @else - {{ __('Vous serez prochainement contacté via vos coordonnées d\'inscription pour recevoir votre lot.') }} + {{ __('Un e-mail de confirmation vous a été envoyé à l\'adresse mail indiquée lors de l\'inscription au jeu. Vous recevrez prochainement plus d\'informations concernant votre dotation par mail.') }} @endif

- {{ __('Merci de bien conserver vos tickets de caisse, en tant que société organisatrice, nous nous réservons le droit de vous demander vos preuves d\'achat afin de valider votre dotation.') }} + {{ __('Merci de bien conserver vos tickets de caisse, la société organisatrice se réserve le droit de vous les demander afin de valider votre dotation.') }}

@if ($settingsGlobal->winning_proof)
+ class="col-12 col-sm-6 col-lg-5 g-0 py-sm-0 g-sm-2 d-flex flex-column justify-content-center align-items-center align-items-xl-start m-0 pt-2">

{{ Arr::get($prizesGlobal, 0)->quantity }} @if (intval(Arr::get($prizesGlobal, 0)->quantity) > 1) @@ -47,6 +47,7 @@ {{ Arr::get($prizesGlobal, 0)->label }} @endif

+

{{ __('Et des milliers de bon d\'achat') }}

@endif