diff --git a/assets/images/favicon-32.png b/assets/images/favicon-32.png deleted file mode 100644 index c82bc7d..0000000 Binary files a/assets/images/favicon-32.png and /dev/null differ diff --git a/assets/images/favicon-48.png b/assets/images/favicon-48.png deleted file mode 100644 index 6c7b0ca..0000000 Binary files a/assets/images/favicon-48.png and /dev/null differ diff --git a/assets/images/favicon-64.png b/assets/images/favicon-64.png deleted file mode 100644 index 0861e5c..0000000 Binary files a/assets/images/favicon-64.png and /dev/null differ diff --git a/assets/images/favicon-96.png b/assets/images/favicon-96.png deleted file mode 100644 index 0861e5c..0000000 Binary files a/assets/images/favicon-96.png and /dev/null differ diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico deleted file mode 100644 index 2917300..0000000 Binary files a/assets/images/favicon.ico and /dev/null differ diff --git a/assets/images/favicon.png b/assets/images/favicon.png deleted file mode 100644 index 7e58d66..0000000 Binary files a/assets/images/favicon.png and /dev/null differ diff --git a/favicon/android-chrome-192x192.png b/favicon/android-chrome-192x192.png index cd120d1..e84712f 100644 Binary files a/favicon/android-chrome-192x192.png and b/favicon/android-chrome-192x192.png differ diff --git a/favicon/android-chrome-512x512.png b/favicon/android-chrome-512x512.png index 1b83363..12f369a 100644 Binary files a/favicon/android-chrome-512x512.png and b/favicon/android-chrome-512x512.png differ diff --git a/favicon/apple-touch-icon.png b/favicon/apple-touch-icon.png index 9b0c613..c2f7301 100644 Binary files a/favicon/apple-touch-icon.png and b/favicon/apple-touch-icon.png differ diff --git a/favicon/browserconfig.xml b/favicon/browserconfig.xml index 55bdcdc..f9c2e67 100644 --- a/favicon/browserconfig.xml +++ b/favicon/browserconfig.xml @@ -3,7 +3,7 @@ - #ea892d + #2b5797 diff --git a/favicon/favicon-16x16.png b/favicon/favicon-16x16.png index 219b7ae..cb0de06 100644 Binary files a/favicon/favicon-16x16.png and b/favicon/favicon-16x16.png differ diff --git a/favicon/favicon-32x32.png b/favicon/favicon-32x32.png index 43e599a..586b050 100644 Binary files a/favicon/favicon-32x32.png and b/favicon/favicon-32x32.png differ diff --git a/favicon/favicon.ico b/favicon/favicon.ico index 82a7bbf..1650a77 100644 Binary files a/favicon/favicon.ico and b/favicon/favicon.ico differ diff --git a/favicon/mstile-150x150.png b/favicon/mstile-150x150.png index 64b6650..e897e87 100644 Binary files a/favicon/mstile-150x150.png and b/favicon/mstile-150x150.png differ diff --git a/favicon/safari-pinned-tab.svg b/favicon/safari-pinned-tab.svg index 0aed1c7..f61f502 100644 --- a/favicon/safari-pinned-tab.svg +++ b/favicon/safari-pinned-tab.svg @@ -2,70 +2,108 @@ Created by potrace 1.14, written by Peter Selinger 2001-2017 - - + + + + + + + + + + + diff --git a/favicon/site.webmanifest b/favicon/site.webmanifest index 374a465..b20abb7 100644 --- a/favicon/site.webmanifest +++ b/favicon/site.webmanifest @@ -1,6 +1,6 @@ { - "name": "Boutique Mairet", - "short_name": "Boutique Mairet", + "name": "", + "short_name": "", "icons": [ { "src": "/android-chrome-192x192.png", diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss new file mode 100644 index 0000000..2bd6dce --- /dev/null +++ b/sass/base/_layout.scss @@ -0,0 +1 @@ +// Empty. diff --git a/sass/fo.scss b/sass/fo.scss index ca97517..087760c 100644 --- a/sass/fo.scss +++ b/sass/fo.scss @@ -10,3 +10,4 @@ @import "./base/bootstrap-overload"; @import "./base/fonts"; @import "./base/common"; +@import "./base/layout"; diff --git a/views/fo/layout.blade.php b/views/fo/layout.blade.php index 141e1c4..9b398fd 100644 --- a/views/fo/layout.blade.php +++ b/views/fo/layout.blade.php @@ -4,11 +4,17 @@ @yield('title') - {{ $settingsGlobal->name }} - - - - - + + + {{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}} + + + + + + + + {{-- diff --git a/views/fo/partials/footer.blade.php b/views/fo/partials/footer.blade.php index 5d97712..bc7c739 100644 --- a/views/fo/partials/footer.blade.php +++ b/views/fo/partials/footer.blade.php @@ -4,7 +4,7 @@ --}} @@ -71,11 +71,12 @@ Gestion des cookies -
Haut de page
+
Haut de page
@include('theme::fo.cookie')
+ nonce="{{ $nonce ?? '' }}"> diff --git a/views/fo/partials/header.blade.php b/views/fo/partials/header.blade.php index 9e2a811..0042da4 100644 --- a/views/fo/partials/header.blade.php +++ b/views/fo/partials/header.blade.php @@ -1,8 +1,8 @@
diff --git a/views/fo/partials/teaser-footer.blade.php b/views/fo/partials/teaser-footer.blade.php index 577665c..c76a09b 100644 --- a/views/fo/partials/teaser-footer.blade.php +++ b/views/fo/partials/teaser-footer.blade.php @@ -4,7 +4,7 @@ --}} @@ -56,7 +56,7 @@
- Haut de page + Haut de page
diff --git a/views/vendor/cn-cookies.blade.php b/views/vendor/cn-cookies.blade.php new file mode 100644 index 0000000..ad7c6db --- /dev/null +++ b/views/vendor/cn-cookies.blade.php @@ -0,0 +1,109 @@ +{{-- blade-formatter-disable --}} +@php + +$site_name = Str::ucfirst(config('app.name')); +$logo_picture_url = Vite::asset('resources/theme/mounted/assets/images/home_logo.png', 'build'); +$logo_alt_text = "Logo {$site_name}"; +$confidentiality_page_url = route('fo.policies.show'); + +$strings = (object)[ + 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), + 'button_forbid' => __('cookie-notice.button_forbid'), + 'button_allow' => __('cookie-notice.button_allow'), + 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), + 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), + 'button_customize' => Str::upper(__('cookie-notice.button_customize')), + 'button_back' => Str::upper(__('cookie-notice.button_back')), + 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), + 'banner_text_open' => __('cookie-notice.banner_text_open', ['site_name' => $site_name]), + 'banner_text' => __('cookie-notice.banner_text'), + 'banner_details' => __('cookie-notice.banner_details'), + 'banner_details_link' => __('cookie-notice.banner_details_link'), + 'banner_details_link_title' => __('cookie-notice.banner_details_link_title'), + 'banner_more_details' => __('cookie-notice.banner_more_details'), + 'banner_less_details' => __('cookie-notice.banner_less_details'), + 'Panel_title' => __('cookie-notice.Panel_title'), + 'Panel_subtitle' => __('cookie-notice.Panel_subtitle'), + 'Panel_details' => __('cookie-notice.Panel_details'), +]; + +$cookies = []; + +// RECAPTCHA +$cookies['recaptcha'] = [ + 'name' => __('cookie-notice.custom.recaptcha.title'), + 'description' => __('cookie-notice.custom.recaptcha.description'), + 'link' => 'https://policies.google.com/privacy', + 'labelLink' => __('En savoir +'), + 'cookies' => ['NID', '__Secure-3PAPISID', '__Secure-3PSID', '__Secure-3PSIDCC'] +]; + +$cookies['recaptcha']['script'] = << +@endpush diff --git a/views/vendor/cookie-notice-templates/standard.blade.php b/views/vendor/cookie-notice-templates/standard.blade.php new file mode 100644 index 0000000..89a4a1c --- /dev/null +++ b/views/vendor/cookie-notice-templates/standard.blade.php @@ -0,0 +1,91 @@ + diff --git a/views/vendor/errors/404.blade.php b/views/vendor/errors/404.blade.php index 9eba27a..d3fa028 100644 --- a/views/vendor/errors/404.blade.php +++ b/views/vendor/errors/404.blade.php @@ -1,16 +1,12 @@ -@extends('theme::fo.layout') +@extends('errors::illustrated-layout') -@section('title', 'Erreur 404') +@section('title', __('Not Found')) +@section('code', '404') +@section('message', __('Not Found')) +@section('submessage', __('Ce n\'est pas la page que vous recherchez...')) -@section('content') -
-
-
-

Page non trouvée

-

La page que vous recherchez n'existe pas.

-
-

Cliquez sur le bouton ci-dessous pour retourner à l'accueil.

- Accueil -
-
+@section('button', true) + +@section('image') + @endsection diff --git a/views/vendor/errors/503.blade.php b/views/vendor/errors/503.blade.php new file mode 100644 index 0000000..b476aa4 --- /dev/null +++ b/views/vendor/errors/503.blade.php @@ -0,0 +1,10 @@ +@extends('errors::illustrated-layout') + +@section('title', __('Service Unavailable')) +@section('code', '503') +@section('message', __('Service Unavailable')) +@section('submessage', __('Le site est en maintenance, nous reviendrons...')) + +@section('image') + +@endsection diff --git a/views/vendor/mail/html/header.blade.php b/views/vendor/mail/html/header.blade.php new file mode 100644 index 0000000..920bc2d --- /dev/null +++ b/views/vendor/mail/html/header.blade.php @@ -0,0 +1,13 @@ + + + + @if (trim($slot) === 'Laravel') + + @else + {{-- FIXME: Personaliser ca --}} + + {{ $slot }} + @endif + + +