conflicts

components/HeaderBlock.vue

@@ -35,28 +35,64 @@
         </button>
       </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" />
-        <div class="flex items-center">
-          <div class="flex items-center gap-7">
-            <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"
-            />
-          </div>
+        <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"
+          />
           <ThemeSwitcher />
-          <button
-            class="hover:bg-button-hover bg-button cursor-pointer rounded-xl px-6 py-3 font-medium text-white transition-all"
-          >
-            E-shop
-          </button>
+          <img
+            class="h-8 w-8 cursor-pointer"
+            src="/icons/Menu.svg"
+            alt="Cart"
+          />
+        </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>
     </UContainer>

components/sections/main-page/MainHero.vue

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