Resolved conflicts for Details page

Codex-digital1 · Sep 22, 2024 · 91b4295 · 91b4295
2 parents ab13afd + 712b2c0
commit 91b4295
Show file tree

Hide file tree

Showing 10 changed files with 588 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.3.0",
+    "react-image-magnify": "^2.7.4",
     "react-router-dom": "^6.26.2",
     "swiper": "^11.1.14"
   },

diff --git a/public/Details-page-img/detailsImg1.webp b/public/Details-page-img/detailsImg1.webp
diff --git a/public/Details-page-img/detailsImg2.webp b/public/Details-page-img/detailsImg2.webp
diff --git a/public/Details-page-img/detailsImg3.webp b/public/Details-page-img/detailsImg3.webp
diff --git a/src/index.css b/src/index.css
@@ -1,3 +1,6 @@
+
+@import url('https://fonts.googleapis.com/css2?family=Great+Vibes&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap');
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -17,21 +20,39 @@ code {
 }
 
 
+
 @layer components {
   .btn-primary {
     @apply flex items-center gap-2 bg-primary whitespace-nowrap
     py-1 px-2  text-white text-sm font-normal cursor-pointer rounded hover:bg-[#BF2718] transition-all duration-300 ease-linear capitalize;
   }
   .btn-secondary {
-    @apply py-3 px-6 md:px-8 text-sm md:text-xl  bg-primary text-white  font-semibold cursor-pointer  hover:bg-[#BF2718] transition-all duration-300 ease-linear border-none capitalize;
+    @apply py-3 px-6  text-sm   bg-primary text-white  font-semibold cursor-pointer  hover:bg-[#BF2718] transition-all duration-300 ease-linear border-none capitalize;
   }
 }
 
-.section-to-section-margin{
-  @apply mt-8 mb-8 md:mt-16 md:mb-16 lg:mt-24 lg:mb-24;
+
+@layer utilities {
+
+  .section-to-section-margin{
+    @apply mt-8 mb-8 md:mt-16 md:mb-16 lg:mt-24 lg:mb-24;
+  }
+  .scrollbar-none::-webkit-scrollbar {
+    display: none;
+  }
+
+  .scrollbar-none {
+    -ms-overflow-style: none; /* Internet Explorer and Edge */
+    scrollbar-width: none; /* Firefox */
+  }
 }
 
 
+
 .inter{
   font-family: "Inter", system-ui;
-}
+}
+
+
+/*  */
+