diff --git a/site/blueprints/pages/home.yml b/site/blueprints/pages/home.yml index 003416f..2bb73e3 100644 --- a/site/blueprints/pages/home.yml +++ b/site/blueprints/pages/home.yml @@ -23,13 +23,13 @@ tabs: type: writer marks: false nodes: false - ctaText: + cta_text: width: 1/2 label: Texte du bouton CTA help: CTA pour call to action type: text default: Explorer - ctaLink: + cta_link: width: 1/2 label: Lien du bouton CTA help: CTA pour call to action diff --git a/site/templates/home.json.php b/site/templates/home.json.php index a8f86bd..94c9c2f 100644 --- a/site/templates/home.json.php +++ b/site/templates/home.json.php @@ -5,8 +5,8 @@ $specificData = [ 'title' => $page->hero_title()->value(), 'title_highlight' => $page->hero_title_highlight()->value(), 'subtitle' => $page->hero_subtitle()->value(), - 'ctaText' => $page->ctaText()->value(), - 'ctaPath' => $page->ctaLink()->toPage()?->id() ?? '#', + 'cta_text' => $page->hero_cta_text()->value(), + 'cta_link' => $page->hero_cta_link()->toPage()?->url() ?? '#', 'image' => $page->hero_image()->toFile()?->url() ], 'background_video' => $page->background_video()->toFile()?->url(), diff --git a/src/components/layout/Header.svelte b/src/components/layout/Header.svelte index 33be62a..81cc04d 100644 --- a/src/components/layout/Header.svelte +++ b/src/components/layout/Header.svelte @@ -2,7 +2,7 @@ import { navigation } from '@state/navigation.svelte' import { locale } from '@state/locale.svelte' import { page } from '@state/page.svelte' - import { navigateTo } from '@router' + import { navigateTo } from '@state/router' const isMenuOpen = $derived(navigation.isMenuOpen) const currentLang = $derived(locale.current) diff --git a/src/main.js b/src/main.js index 7ab22da..78c060e 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import './styles/index.css' import App from './App.svelte' import { mount } from 'svelte' -import { initRouter } from './router' +import { initRouter } from './state/router' initRouter() diff --git a/src/utils/animations.js b/src/state/animations.js similarity index 100% rename from src/utils/animations.js rename to src/state/animations.js diff --git a/src/router/index.js b/src/state/router.js similarity index 92% rename from src/router/index.js rename to src/state/router.js index a3b955f..2d0e95c 100644 --- a/src/router/index.js +++ b/src/state/router.js @@ -1,8 +1,8 @@ import navaid from "navaid"; -import { page } from "@state/page.svelte"; -import { navigation } from "@state/navigation.svelte"; -import { site } from "@state/site.svelte"; -import { locale } from "@state/locale.svelte"; +import { page } from "./page.svelte"; +import { navigation } from "./navigation.svelte"; +import { site } from "./site.svelte"; +import { locale } from "./locale.svelte"; export const router = navaid("/", () => { // Default handler diff --git a/src/style.css b/src/style.css index b1f001e..f5895ba 100644 --- a/src/style.css +++ b/src/style.css @@ -121,7 +121,7 @@ body { /* Golden Grid */ .golden-grid { - height: 100vh !important; + height: 100% !important; min-height: 100% !important; display: grid !important; position: relative; @@ -198,7 +198,7 @@ body { .earth-icon { width: 24px; height: 24px; - background-image: url("/assets/img/icon-earth-green.png"); + background-image: url('/assets/img/icon-earth-green.png'); background-size: contain; background-repeat: no-repeat; background-position: center; @@ -207,8 +207,7 @@ body { } .button:hover .earth-icon { - filter: brightness(0) saturate(100%) invert(77%) sepia(82%) saturate(507%) - hue-rotate(91deg) brightness(101%) contrast(97%); + filter: brightness(0) saturate(100%) invert(77%) sepia(82%) saturate(507%) hue-rotate(91deg) brightness(101%) contrast(97%); } /* Clickable elements */ diff --git a/src/styles/layout.css b/src/styles/layout.css index a0c3b74..8f6fb71 100644 --- a/src/styles/layout.css +++ b/src/styles/layout.css @@ -1,6 +1,6 @@ /* Golden Grid */ .golden-grid { - height: 100vh !important; + height: 100% !important; min-height: 100% !important; display: grid !important; position: relative; diff --git a/src/views/Home.svelte b/src/views/Home.svelte index a3e432c..db773dc 100644 --- a/src/views/Home.svelte +++ b/src/views/Home.svelte @@ -1,12 +1,27 @@ @@ -110,7 +125,7 @@ style="z-index: 5; justify-self: center; margin-top: 6vmax;" >