diff --git a/assets/images/up-arrow.svg b/assets/images/up-arrow.svg
deleted file mode 100644
index 1809a75..0000000
--- a/assets/images/up-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss
index c33da02..c82caaf 100644
--- a/sass/base/_layout.scss
+++ b/sass/base/_layout.scss
@@ -1,9 +1,42 @@
+@use "sass:map";
+
body {
> header {
+ @include media-breakpoint-up(xl) {
+ .rest-in-game-banner-container {
+ overflow: hidden;
+ }
+ }
+
.rest-in-game-banner {
+ transform: skew(12deg) translateX(5%);
+
+ >span {
+ transform: skew(-12deg);
+ }
+ }
+
+ .btn-connect {
+ position: relative;
+ padding-left: 2.3rem;
+
&::before {
- background-color: $color-primary;
- content: ' ';
+ position: absolute;
+ top: 50%;
+ left: 0.3rem;
+ width: 1.5rem;
+ height: 1.5rem;
+ background-image: url('@Theme/images/connect.png');
+ background-size: contain;
+ content: "";
+ transform: translateY(-50%);
+ }
+ }
+
+ @include media-breakpoint-up(xxxl, map.merge($grid-breakpoints, ("xxxl": 1600px))) {
+ .navbar-brand {
+ position: absolute;
+ top: 0;
}
}
}
@@ -69,13 +102,15 @@ body {
padding: 0;
margin-right: 1rem;
- img {
- width: 3rem;
- }
-
&.show {
display: block;
}
+
+ svg {
+ width: 3rem;
+ fill: $color-dark;
+ filter: drop-shadow(0 0 2px #{rgba($color-light, $alpha: 0.4)});
+ }
}
}
}
diff --git a/sass/fo.scss b/sass/fo.scss
index 7a221c0..26f5750 100644
--- a/sass/fo.scss
+++ b/sass/fo.scss
@@ -15,3 +15,4 @@
// * PAGES
@import "./pages/home";
+@import "./pages/static_page";
diff --git a/sass/pages/_static_page.scss b/sass/pages/_static_page.scss
new file mode 100644
index 0000000..8baf53b
--- /dev/null
+++ b/sass/pages/_static_page.scss
@@ -0,0 +1,18 @@
+.static-page {
+ h1 {
+ color: $color-quint;
+ text-align: center;
+ text-transform: uppercase;
+ }
+
+ h2,h3,h4,h5,h6 {
+ color: $color-quad;
+ text-transform: uppercase;
+ }
+
+ hr {
+ width: 30%;
+ border-top: 0.2rem solid #{$color-quad};
+ margin: 0 auto;
+ }
+}
\ No newline at end of file
diff --git a/sass/utilities/_bootstrap-variables.scss b/sass/utilities/_bootstrap-variables.scss
index 7af4d0e..6e7f846 100644
--- a/sass/utilities/_bootstrap-variables.scss
+++ b/sass/utilities/_bootstrap-variables.scss
@@ -1,3 +1,6 @@
+@use "sass:map";
+@import 'bootstrap/scss/functions';
+
// Override bootstrap colors
$primary: $color-primary;
$secondary: $color-secondary;
@@ -6,19 +9,54 @@ $info: $color-info;
$warning: $color-warning;
$danger: $color-danger;
$light: $color-light;
+$white: $color-white;
$dark: $color-dark;
+$tertiary: $color-tertiary;
+$quad: $color-quad;
+$quint: $color-quint;
$theme-colors: (
primary: $primary,
secondary: $secondary,
+ tertiary: $tertiary,
+ quad: $quad,
+ quint: $quint,
success: $success,
info: $info,
warning: $warning,
danger: $danger,
light: $light,
+ "white": $white,
dark: $dark,
);
+$custom-theme-colors: map.merge($theme-colors,
+(
+ 'tertiary': $tertiary,
+ 'quad': $quad,
+ 'quint': $quint,
+));
+$theme-colors: map.merge($theme-colors, $custom-theme-colors);
+$theme-colors-rgb: map-loop($theme-colors, to-rgb, '$value');
// Override bootstrap vars
$font-family-base: $font-default-family-base;
$font-size-base: $font-default-size-base;
$line-height-base: $line-default-height-base;
+
+// Add font-size variable
+$heading-multiplicator: 1;
+$h1-font-size: $font-size-base * $heading-multiplicator * 2.5;
+$h2-font-size: $font-size-base * $heading-multiplicator * 2;
+$h3-font-size: $font-size-base * $heading-multiplicator * 1.75;
+$h4-font-size: $font-size-base * $heading-multiplicator * 1.5;
+$h5-font-size: $font-size-base * $heading-multiplicator * 1.25;
+$h6-font-size: $font-size-base * $heading-multiplicator;
+
+// Add the new font-size in this map
+$font-sizes: (
+ 1: $h1-font-size,
+ 2: $h2-font-size,
+ 3: $h3-font-size,
+ 4: $h4-font-size,
+ 5: $h5-font-size,
+ 6: $h6-font-size,
+);
\ No newline at end of file
diff --git a/sass/utilities/_variables.scss b/sass/utilities/_variables.scss
index f6b3f76..9dae5b9 100644
--- a/sass/utilities/_variables.scss
+++ b/sass/utilities/_variables.scss
@@ -1,13 +1,18 @@
+@use "sass:color";
+
// * COLORS
$color-white: #fff;
-$color-light: #f8f9fa;
-$color-dark: #212529;
-$color-success: #198754;
-$color-danger: #dc3545;
-$color-info: #0dcaf0;
-$color-warning: #ffc107;
-$color-primary: #0d6efd;
-$color-secondary: #6c757d;
+$color-light: #eceff3;
+$color-dark: #070000;
+$color-success: #00ac61;
+$color-danger: #f71200;
+$color-info: #508fdf;
+$color-warning: #e6cd00;
+$color-primary: #0f437e;
+$color-secondary: #135ba7;
+$color-tertiary: #db275a;
+$color-quad: #0179a9;
+$color-quint: #fba629;
// * BACKGROUNDS COLORS
$bg-lightened: $color-light;
@@ -22,3 +27,9 @@ $color-default-texts: $color-dark;
$font-default-family-base: "Imprima Regular", sans-serif; // - The default site font family.
$font-default-size-base: 1rem; // Assumes the browser default, typically `16px`
$line-default-height-base: 1.65;
+
+
+// * Cookie Notice
+$ck-primary-color: $color-primary;
+$ck-secondary-color: color.adjust($color-tertiary, $lightness: -10%);
+$ck-background-color: $color-light;
diff --git a/ts/base/common.ts b/ts/base/common.ts
index 7c31875..f1dedb5 100644
--- a/ts/base/common.ts
+++ b/ts/base/common.ts
@@ -55,7 +55,7 @@ document.addEventListener("DOMContentLoaded", function () {
const pageUp = document.getElementById("page-up");
if (pageUp) {
- pageUp.addEventListener("click", () => scrollTop("content-container", 150)),
+ pageUp.addEventListener("click", () => scrollTop("content-container", 250)),
document.addEventListener("scroll", () => {
if (window.scrollY > 250) {
pageUp.classList.add("show");
diff --git a/views/fo/confirm-email.blade.php b/views/confirm-email.blade.php
similarity index 98%
rename from views/fo/confirm-email.blade.php
rename to views/confirm-email.blade.php
index 41e038c..bd5a6b5 100644
--- a/views/fo/confirm-email.blade.php
+++ b/views/confirm-email.blade.php
@@ -1,4 +1,4 @@
-@extends('theme::fo.layout')
+@extends('theme::layout')
@section('title', 'Activation de votre compte')
diff --git a/views/fo/end.blade.php b/views/end.blade.php
similarity index 92%
rename from views/fo/end.blade.php
rename to views/end.blade.php
index 4878733..e43b086 100644
--- a/views/fo/end.blade.php
+++ b/views/end.blade.php
@@ -1,4 +1,4 @@
-@extends('theme::fo.layout')
+@extends('theme::layout')
@section('title', 'Fin du jeu')
diff --git a/views/fo/enter-code.blade.php b/views/enter-code.blade.php
similarity index 98%
rename from views/fo/enter-code.blade.php
rename to views/enter-code.blade.php
index 07e8827..09acf44 100644
--- a/views/fo/enter-code.blade.php
+++ b/views/enter-code.blade.php
@@ -1,4 +1,4 @@
-@extends('theme::fo.layout')
+@extends('theme::layout')
@section('title', 'Saisie du code')
diff --git a/views/fo/error-arcadia-email.blade.php b/views/error-arcadia-email.blade.php
similarity index 100%
rename from views/fo/error-arcadia-email.blade.php
rename to views/error-arcadia-email.blade.php
diff --git a/views/fo/faq.blade.php b/views/faq.blade.php
similarity index 95%
rename from views/fo/faq.blade.php
rename to views/faq.blade.php
index 40aff28..dea2133 100644
--- a/views/fo/faq.blade.php
+++ b/views/faq.blade.php
@@ -1,4 +1,4 @@
-@extends('theme::fo.layout')
+@extends('theme::layout')
@section('title', 'Accueil')
diff --git a/views/fo/layouts/header.blade.php b/views/fo/layouts/header.blade.php
deleted file mode 100644
index deacb21..0000000
--- a/views/fo/layouts/header.blade.php
+++ /dev/null
@@ -1,93 +0,0 @@
-{{--
C'est perdu
diff --git a/views/fo/notif-admin.blade.php b/views/notif-admin.blade.php similarity index 100% rename from views/fo/notif-admin.blade.php rename to views/notif-admin.blade.php diff --git a/views/fo/notif-win-admin-email.blade.php b/views/notif-win-admin-email.blade.php similarity index 100% rename from views/fo/notif-win-admin-email.blade.php rename to views/notif-win-admin-email.blade.php diff --git a/views/fo/pages/gain1.blade.php b/views/pages/gain1.blade.php similarity index 99% rename from views/fo/pages/gain1.blade.php rename to views/pages/gain1.blade.php index 2719d0b..8c2c902 100644 --- a/views/fo/pages/gain1.blade.php +++ b/views/pages/gain1.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prizesGlobal[0]->gain_view->name }} diff --git a/views/fo/pages/gain2.blade.php b/views/pages/gain2.blade.php similarity index 99% rename from views/fo/pages/gain2.blade.php rename to views/pages/gain2.blade.php index 75b3ff6..6568701 100644 --- a/views/fo/pages/gain2.blade.php +++ b/views/pages/gain2.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prizesGlobal[1]->gain_view->name }} diff --git a/views/fo/pages/home.blade.php b/views/pages/home.blade.php similarity index 89% rename from views/fo/pages/home.blade.php rename to views/pages/home.blade.php index a8ebff5..64b3aa8 100644 --- a/views/fo/pages/home.blade.php +++ b/views/pages/home.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Accueil') @@ -25,9 +25,9 @@{{ __('1 activité pour 2 à 6 personnes') }}
@@ -171,7 +171,7 @@{{ __('1 activité pour 1 à 2 personnes') }}
@@ -199,7 +199,7 @@ {{-- BTN JOUER --}} diff --git a/views/pages/static_page.blade.php b/views/pages/static_page.blade.php new file mode 100644 index 0000000..169c1d2 --- /dev/null +++ b/views/pages/static_page.blade.php @@ -0,0 +1,22 @@ +@extends('theme::layout') + +@section('title', $staticPageModel->seo_title) +@section('description', $staticPageModel->seo_description) + +@section('main-class', 'static-page') +@section('content') +Votre profil
+ + + + --> diff --git a/views/fo/reglement.blade.php b/views/reglement.blade.php similarity index 89% rename from views/fo/reglement.blade.php rename to views/reglement.blade.php index bc710a5..85d034d 100644 --- a/views/fo/reglement.blade.php +++ b/views/reglement.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Règlement') diff --git a/views/fo/replay.blade.php b/views/replay.blade.php similarity index 94% rename from views/fo/replay.blade.php rename to views/replay.blade.php index 2a69cda..01ba122 100644 --- a/views/fo/replay.blade.php +++ b/views/replay.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Rejouer') diff --git a/views/fo/teaser.blade.php b/views/teaser.blade.php similarity index 99% rename from views/fo/teaser.blade.php rename to views/teaser.blade.php index 6c1a355..a9f943d 100644 --- a/views/fo/teaser.blade.php +++ b/views/teaser.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Accueil') diff --git a/views/vendor/cn-cookies.blade.php b/views/vendor/cn-cookies.blade.php index 68de6ec..799d4cd 100644 --- a/views/vendor/cn-cookies.blade.php +++ b/views/vendor/cn-cookies.blade.php @@ -2,29 +2,37 @@ @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}"; +$logo_picture_url = Vite::asset('resources/theme/mounted/assets/images/home_logo.png'); +$logo_title_text = __('Logo du site :name', ['name' => $site_name]); +$logo_alt_text = __('Logo :name', ['name' => $site_name]); $confidentiality_page_url = route('fo.charte'); $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'), + 'modal_title' => __('Fenetre de gestion de cookies'), + 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), + 'button_close_cookies' => __('cookie-notice.button_close_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_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), + 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), + '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'), + 'banner_more_details' => __('cookie-notice.banner_more_details'), + 'banner_less_details' => __('cookie-notice.banner_less_details'), + 'Panel_title' => __('cookie-notice.Panel_title'), + 'Panel_content' => __('cookie-notice.Panel_content'), + 'Panel_subtitle' => __('cookie-notice.Panel_subtitle'), + 'Panel_details' => __('cookie-notice.Panel_details'), + 'picture_cookie_title' => __('Image d\'un bon gros cookie'), + 'navigation_title' => __('Navigation du panneau des cookie'), ]; $cookies = []; @@ -80,7 +88,7 @@ SCRIPT; {{-- INCLUDE TEMPLATE --}} @include('theme::vendor.cookie-notice-templates.standard', compact( 'site_name', 'logo_picture_url', 'logo_alt_text', - 'confidentiality_page_url', 'strings' + 'logo_title_text', 'confidentiality_page_url', 'strings' )) @push('scripts') diff --git a/views/vendor/cookie-notice-templates/standard.blade.php b/views/vendor/cookie-notice-templates/standard.blade.php index 89a4a1c..c17f9b4 100644 --- a/views/vendor/cookie-notice-templates/standard.blade.php +++ b/views/vendor/cookie-notice-templates/standard.blade.php @@ -1,31 +1,32 @@ -