resolved conflicts from develop

2025-10-03 10:31:05 +01:00
parent 68e944a6a2 306b8f70b9
commit ce9d953f04
16 changed files with 570 additions and 290 deletions
--- a/src/components/UI/Header.tsx
+++ b/src/components/UI/Header.tsx
@@ -32,7 +32,7 @@ export default function Header() {
  };

  return (
-    <div className="relative bg-[#253445] border-b border-gray-500 items-center mx-auto px-2 sm:px-6 lg:px-8 p-4 flex flex-col md:flex-row justify-between mb-7">
+    <div className="relative bg-[#253445] border-b border-gray-500 items-center mx-auto px-2 sm:px-6 lg:px-8 p-4 flex flex-col md:flex-row justify-between mb-7 space-y-6 md:space-y-0">
      <div className="w-30">
        <Link to={"/"}>
          <img src={Logo} alt="Logo" width={150} height={150} />