diff --git a/assets/css/custom-panel.css b/assets/css/custom-panel.css index 1554ae5..fbfc565 100644 --- a/assets/css/custom-panel.css +++ b/assets/css/custom-panel.css @@ -37,9 +37,7 @@ --font-title: 'Terminal Grotesque', sans-serif; --font-body: 'Danzza', sans-serif; - /*dé commenter pour ajouter leur font*/ - /*font récuperer via leur site donc je ne sais pas quel est la licence*/ - /* --font-sans: 'Danzza', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; */ + --font-sans: 'Danzza', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --text-h1: 3em; diff --git a/site/blueprints/pages/about.yml b/site/blueprints/pages/about.yml index b370fe7..f9d0a97 100644 --- a/site/blueprints/pages/about.yml +++ b/site/blueprints/pages/about.yml @@ -14,6 +14,15 @@ tabs: fields: intro: type: writer + marks: + - bold + - italic + - green + - pixel + - underline + - strike + - clear + - link nodes: - heading headings: @@ -21,6 +30,7 @@ tabs: buttons: false help: Section de texte centrée. body: + label: corps type: blocks fieldsets: - type: text @@ -40,7 +50,8 @@ tabs: template: member translate: false image: - ratio: 2/3 + ratio: 3/5 cover: true + back: '#0e1e43' text: "{{ file.member_name }}" info: "{{ file.role }}" diff --git a/site/blueprints/pages/article.yml b/site/blueprints/pages/article.yml index 486a3e6..2620402 100644 --- a/site/blueprints/pages/article.yml +++ b/site/blueprints/pages/article.yml @@ -42,24 +42,11 @@ tabs: label: Contenu de l'article type: blocks fieldsets: - heading: - label: Titre - type: heading - text: - label: Texte - type: text - quote: - label: Citation - type: quote - image: - label: Image - type: image - list: - label: Liste - type: list - video: - label: Vidéo - type: video + - heading + - text + - list + - image + - video # Sidebar sidebar: diff --git a/site/blueprints/pages/blog.yml b/site/blueprints/pages/blog.yml index 9f1d2ae..d17fc5b 100644 --- a/site/blueprints/pages/blog.yml +++ b/site/blueprints/pages/blog.yml @@ -15,10 +15,12 @@ tabs: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link nodes: - heading headings: diff --git a/site/blueprints/pages/default.yml b/site/blueprints/pages/default.yml index eaf29ff..aad110c 100644 --- a/site/blueprints/pages/default.yml +++ b/site/blueprints/pages/default.yml @@ -12,10 +12,12 @@ columns: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link sidebar: width: 1/3 sections: diff --git a/site/blueprints/pages/expertise.yml b/site/blueprints/pages/expertise.yml index 0dca120..b837433 100644 --- a/site/blueprints/pages/expertise.yml +++ b/site/blueprints/pages/expertise.yml @@ -18,16 +18,18 @@ tabs: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link required: true help: "Ex: PLAY THE REAL." - textes: - label: Texte + body: + label: corps type: blocks fieldsets: - text_bloc: - label: bloc de texte - type: text + - text + - list + type: blocks diff --git a/site/blueprints/pages/game.yml b/site/blueprints/pages/game.yml index a3c5e5b..60fa7c0 100644 --- a/site/blueprints/pages/game.yml +++ b/site/blueprints/pages/game.yml @@ -26,10 +26,12 @@ columns: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link # Sidebar - width: 1/3 diff --git a/site/blueprints/pages/home.yml b/site/blueprints/pages/home.yml index f79f60b..2ea6155 100644 --- a/site/blueprints/pages/home.yml +++ b/site/blueprints/pages/home.yml @@ -12,10 +12,6 @@ tabs: hero_content: type: fields fields: - title: - label: Titre principal - type: text - required: true subtitle: label: Sous-titre type: writer @@ -24,11 +20,13 @@ tabs: cta_text: width: 1/2 label: Texte du bouton CTA + help: CTA pour call to action type: text default: Explorer cta_link: width: 1/2 label: Lien du bouton CTA + help: CTA pour call to action type: pages max: 1 - width: 1/3 diff --git a/site/blueprints/pages/portfolio.yml b/site/blueprints/pages/portfolio.yml index 4aa0011..0748cef 100644 --- a/site/blueprints/pages/portfolio.yml +++ b/site/blueprints/pages/portfolio.yml @@ -1,5 +1,5 @@ title: Portfolio -icon: grid +icon: images tabs: content: diff --git a/site/blueprints/pages/project.yml b/site/blueprints/pages/project.yml index 4a0cdc9..2d494fb 100644 --- a/site/blueprints/pages/project.yml +++ b/site/blueprints/pages/project.yml @@ -28,10 +28,12 @@ columns: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link help: "Ex: Transformez votre lecture en aventure." description: label: Description @@ -39,10 +41,12 @@ columns: marks: - bold - italic - - underline - - strike - green - pixel + - underline + - strike + - clear + - link help: Description complète du projet images: @@ -90,6 +94,7 @@ columns: label: Vignette type: files layout: cards + size: small max: 1 accept: image/* translate: false diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml index 8511041..7d5a376 100644 --- a/site/blueprints/site.yml +++ b/site/blueprints/site.yml @@ -5,7 +5,8 @@ columns: sections: pages: type: pages - label: Réorganisation des pages + label: Menu + help: Accédez aux pages et réordonnez-les layout: list size: small sortable: true diff --git a/site/cache/index.html b/site/cache/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/site/config/config.php b/site/config/config.php index af850da..e285d59 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -10,10 +10,11 @@ return [ // Menu personnalisé du panel 'menu' => [ 'site' => [ - 'label' => 'Site', - 'icon' => 'home', + 'label' => 'Données partagées', + 'icon' => 'cog', 'current' => function (string $current): bool { - return $current === 'site'; + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, '/site'); } ], '-', // Séparateur @@ -21,31 +22,55 @@ return [ 'label' => 'Accueil', 'icon' => 'home', 'link' => 'pages/home', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/home'); + } ], 'expertise' => [ 'label' => 'Expertise', 'icon' => 'wand', 'link' => 'pages/expertise', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/expertise'); + } ], 'portfolio' => [ 'label' => 'Portfolio', 'icon' => 'images', 'link' => 'pages/portfolio', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/portfolio'); + } ], 'jouer' => [ 'label' => 'Jouer', 'icon' => 'play', 'link' => 'pages/jouer', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/jouer'); + } ], 'a-propos' => [ 'label' => 'À propos', 'icon' => 'users', 'link' => 'pages/a-propos', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/a-propos'); + } ], 'blog' => [ 'label' => 'Blog', 'icon' => 'text', 'link' => 'pages/blog', + 'current' => function (string $current): bool { + $path = Kirby\Cms\App::instance()->path(); + return Str::contains($path, 'pages/blog'); + } ], '-', // Séparateur 'users', diff --git a/site/plugins/custom-marks/index.js b/site/plugins/custom-marks/index.js index 164003c..396e525 100644 --- a/site/plugins/custom-marks/index.js +++ b/site/plugins/custom-marks/index.js @@ -1,6 +1,6 @@ panel.plugin("custom/marks", { icons: { - pixel: '' + pixel: '' }, writerMarks: { green: {