conflicts

This commit is contained in:
2025-05-29 10:59:48 +02:00
parent 7e2df27d9c
commit 7ed70d58d2
6 changed files with 5206 additions and 6803 deletions

View File

@ -1,10 +1,10 @@
<template>
<div
class="bg-bg-light dark:bg-bg-dark font-inter flex min-h-screen flex-col overflow-hidden"
class="bg-bg-light dark:bg-bg-dark text-text-light dark:text-text-dark font-inter flex min-h-screen flex-col overflow-hidden"
>
<HeaderBlock />
<div class="flex-1">
<HeaderHero />
<MainHero />
<slot />
</div>
<!-- <footer-block /> -->
@ -12,9 +12,12 @@
</template>
<script setup lang="ts">
import HeaderHero from "~/components/sections/main-page/HeaderHero.vue";
import MainHero from "~/components/sections/main-page/MainHero.vue";
useHead({
link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.png" }],
});
</script>
<style>
</style>