From 7ed70d58d2e226fec89ebf752f02d9b8f1cb9524 Mon Sep 17 00:00:00 2001 From: Arina Yakovenko Date: Thu, 29 May 2025 10:59:48 +0200 Subject: [PATCH] conflicts --- assets/main.css | 3 +- components/HeaderBlock.vue | 74 +- .../{HeaderHero.vue => MainHero.vue} | 2 +- layouts/default.vue | 9 +- package.json | 1 + pnpm-lock.yaml | 11920 +++++++--------- 6 files changed, 5206 insertions(+), 6803 deletions(-) rename components/sections/main-page/{HeaderHero.vue => MainHero.vue} (99%) diff --git a/assets/main.css b/assets/main.css index 0086004..9b59f7b 100644 --- a/assets/main.css +++ b/assets/main.css @@ -1,5 +1,6 @@ @import "@nuxt/ui"; @import "tailwindcss"; +@import '@iconscout/unicons/css/line.css'; @theme { /* fonts */ @@ -39,4 +40,4 @@ .main { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -} +} \ No newline at end of file diff --git a/components/HeaderBlock.vue b/components/HeaderBlock.vue index eb1f563..e744715 100644 --- a/components/HeaderBlock.vue +++ b/components/HeaderBlock.vue @@ -35,28 +35,64 @@