conflicts

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

View File

@ -1,5 +1,6 @@
@import "@nuxt/ui"; @import "@nuxt/ui";
@import "tailwindcss"; @import "tailwindcss";
@import '@iconscout/unicons/css/line.css';
@theme { @theme {
/* fonts */ /* fonts */
@ -39,4 +40,4 @@
.main { .main {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }

View File

@ -35,28 +35,64 @@
</button> </button>
</div> </div>
<div <div
class="hidden h-[120px] w-full items-center justify-between md:flex xl:hidden" class="hidden h-[116px] w-full items-center justify-between md:flex xl:hidden"
> >
<img src="/logo.png" alt="Frame" /> <img src="/logo.png" alt="Frame" />
<div class="flex items-center"> <div class="flex items-center gap-6">
<div class="flex items-center gap-7"> <img
<img class="h-8 w-8 cursor-pointer"
class="h-8 w-8 cursor-pointer" src="/icons/Account.svg"
src="/icons/Account.svg" alt="Account"
alt="Account" />
/> <img
<img class="h-8 w-8 cursor-pointer"
class="h-8 w-8 cursor-pointer" src="/icons/Cart.svg"
src="/icons/Cart.svg" alt="Cart"
alt="Cart" />
/>
</div>
<ThemeSwitcher /> <ThemeSwitcher />
<button <img
class="hover:bg-button-hover bg-button cursor-pointer rounded-xl px-6 py-3 font-medium text-white transition-all" class="h-8 w-8 cursor-pointer"
> src="/icons/Menu.svg"
E-shop alt="Cart"
</button> />
</div>
</div>
<div
class="hidden h-[84px] w-full items-center justify-between sm:flex md:hidden"
>
<img src="/logo.png" alt="Frame" />
<div class="flex items-center gap-6">
<img
class="h-8 w-8 cursor-pointer"
src="/icons/Account.svg"
alt="Account"
/>
<img
class="h-8 w-8 cursor-pointer"
src="/icons/Cart.svg"
alt="Cart"
/>
<img
class="h-8 w-8 cursor-pointer"
src="/icons/Menu.svg"
alt="Cart"
/>
</div>
</div>
<div class="flex h-[84px] w-full items-center justify-between sm:hidden">
<img src="/logo.png" alt="Frame" />
<div class="flex items-center gap-6">
<!-- <img
class="h-8 w-8 cursor-pointer"
src="/icons/Account.svg"
alt="Account"
/> -->
<UIcon class="uil uil-user h-8 w-8 cursor-pointer"></UIcon>
<img
class="h-8 w-8 cursor-pointer"
src="/icons/Menu.svg"
alt="Cart"
/>
</div> </div>
</div> </div>
</UContainer> </UContainer>

View File

@ -41,4 +41,4 @@ const data = {
title_second: title_second:
"Spoření i jednorázová investice do zlata jednoduše a bezpečně s YourGold", "Spoření i jednorázová investice do zlata jednoduše a bezpečně s YourGold",
}; };
</script> </script>

View File

@ -1,10 +1,10 @@
<template> <template>
<div <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 /> <HeaderBlock />
<div class="flex-1"> <div class="flex-1">
<HeaderHero /> <MainHero />
<slot /> <slot />
</div> </div>
<!-- <footer-block /> --> <!-- <footer-block /> -->
@ -12,9 +12,12 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import HeaderHero from "~/components/sections/main-page/HeaderHero.vue"; import MainHero from "~/components/sections/main-page/MainHero.vue";
useHead({ useHead({
link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.png" }], link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.png" }],
}); });
</script> </script>
<style>
</style>

View File

@ -10,6 +10,7 @@
"postinstall": "nuxt prepare" "postinstall": "nuxt prepare"
}, },
"dependencies": { "dependencies": {
"@iconscout/unicons": "^4.2.0",
"@nuxt/eslint": "^1.4.1", "@nuxt/eslint": "^1.4.1",
"@nuxt/ui": "^3.1.2", "@nuxt/ui": "^3.1.2",
"@nuxtjs/i18n": "^9.5.4", "@nuxtjs/i18n": "^9.5.4",

11920
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff