Merge branch 'test' of https://github.com/SweetmanTech/HENO._CUSTOM_W…

…EBSITE into tech322/game-image
sweetmantech · Apr 24, 2024 · 0fbb458 · 0fbb458
2 parents c927b39 + ae10068
commit 0fbb458
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/components/Core/DraggableModal.tsx b/components/Core/DraggableModal.tsx
@@ -22,7 +22,7 @@ const DraggableModal = ({ children, href, handleClose, isVisible = null }) => {
           onClick={handleClose}
         />
         <Draggable scale={1} bounds="parent">
-          <div className="w-[90%] md:w-[450px] h-[70%] md:h-[450px] relative z-[1000]">
+          <div className="w-[90%] md:w-[450px] h-[70%] md:h-[500px] relative z-[1000]">
             <motion.div
               className="flex flex-col bg-black
             h-full w-full p-[10px]"

diff --git a/components/Pages/ContactPage/ContactForm.tsx b/components/Pages/ContactPage/ContactForm.tsx
@@ -24,7 +24,7 @@ const ContactForm = ({ isPopup }) => {
   const inputClasses = `${
     isPopup ? "md:!w-[250px]" : "md:!w-[400px] md:h-[44px]"
   } !w-[200px] !text-[10px] md:!text-[20px] h-[32px] `
-  const labelClasses = `uppercase text-[10px] ${isPopup ? "" : "md:text-[20px]"}`
+  const labelClasses = `uppercase text-[10px] ${!isPopup && "md:text-[20px]"}`
 
   const buttonRef = useRef() as any
 

diff --git a/components/Pages/ContactPage/ContactSuccess.tsx b/components/Pages/ContactPage/ContactSuccess.tsx
@@ -1,7 +1,7 @@
 const ContactSuccess = ({ isPopup }) => (
   <div
     className={`flex justify-center text-gray_1 flex-col
-    items-center text-[16px] ${isPopup ? "" : "text-[24px]"}`}
+    items-center text-[16px] ${!isPopup && "text-[24px]"}`}
   >
     <p>
       INQUIRY HAS BEEN SENT <br /> PLEASE GIVE US 48-72 HRS <br /> TO RESPOND

diff --git a/components/Pages/PressPage/PressContent.tsx b/components/Pages/PressPage/PressContent.tsx
@@ -12,7 +12,7 @@ const PressContent = ({ isPopup = false }) => (
       <div
         className={`h-fit max-h-full overflow-y-auto text-[12px] md:text-[16px]
         p-[15px] md:p-[20px] gap-[30px]
-        grid grid-cols-1 ${isPopup ? "" : "md:grid-cols-2"} w-full`}
+        grid grid-cols-1 ${!isPopup && "md:grid-cols-2"} w-full`}
       >
         {data.map((pressItem) => (
           <a

diff --git a/components/Pages/Web3Page/Trailer.tsx b/components/Pages/Web3Page/Trailer.tsx
@@ -4,7 +4,7 @@ import TopArbitrumSection from "./TopArbitrumSection"
 
 const Trailer = ({ isPopup = false }) => (
   <div className="h-fit max-h-full overflow-y-auto w-full">
-    <div className="flex flex-col items-center gap-y-[15px] md:gap-y-[20px]">
+    <div className={`flex flex-col items-center gap-y-[10px] ${!isPopup && "md:gap-y-[20px]"}`}>
       <div
         className={`flex flex-col gap-y-[10px] ${isPopup ? "max-h-[235px]" : "max-h-[335px]"}
       overflow-y-auto pr-2`}

diff --git a/components/Pages/Web3Page/Web3Content.tsx b/components/Pages/Web3Page/Web3Content.tsx
@@ -11,24 +11,29 @@ const Web3Content = ({ isPopup = false }) => {
   return (
     <div className="p-[5px] md:p-[10px] border-[2px] border-gray_1 h-full">
       <div
-        className="border-[1px] border-darkgray text-gray_1 font-dresden 
-            py-[25px] text-center
-            flex flex-col md:flex-row
-            gap-2 items-center justify-center text-[16px] relative h-full
-            text-[12px] md:text-[16px] relative"
+        className={`border-[1px] border-darkgray text-gray_1 font-dresden 
+        py-[25px] text-center
+        flex flex-col ${!isPopup && "md:flex-row "}
+        gap-2 items-center justify-center text-[16px] relative h-full
+        text-[12px] md:text-[16px] relative`}
       >
         <div
-          className={`md:absolute top-[35px] left-1 text-left md:left-2 capitalize ${
-            isPopup ? "text-[10px] md:text-[14px]" : "text-[12px] md:text-[16px]"
+          className={`z-[2] capitalize ${
+            isPopup
+              ? "text-[10px] md:text-[12px]"
+              : "md:absolute top-[35px] left-1 text-left md:left-2 text-[12px] md:text-[16px]"
           }`}
         >
           {data[selectedDrop].startedAt} <br />
-          <span className="uppercase">{data[selectedDrop].title}</span> {isMobile && <br />}
+          <span className="uppercase">{data[selectedDrop].title}</span>{" "}
+          {isMobile || (isPopup && <br />)}
           By {data[selectedDrop].artist}
         </div>
         <div
-          className="h-fit max-h-full overflow-y-auto text-[12px] md:text-[16px]
-            px-[15px] md:px-[20px] flex flex-col gap-y-[5px] md:gap-y-[20px]"
+          className={`relative z-[1] h-fit max-h-full overflow-y-auto text-[12px] md:text-[16px]
+          px-[15px] md:px-[20px] flex flex-col gap-y-[5px] ${
+            isPopup ? "md:gap-y-[10px]" : "md:gap-y-[20px]"
+          }`}
         >
           <Trailer isPopup={isPopup} />
         </div>

diff --git a/components/Web3Socials/Web3Socials.tsx b/components/Web3Socials/Web3Socials.tsx
@@ -5,7 +5,7 @@ const Web3Socials = ({ isPopup = false }) => {
   const zoraIconSize = isPopup ? "w-[15px] md:w-[20px]" : "w-[18px] md:w-[40px]"
   const soundIconSize = isPopup ? "w-[15px] md:w-[25px]" : "w-[18px] md:w-[40px]"
   const catalogIconSize = isPopup ? "w-[18px] md:w-[30px]" : "w-[20px] md:w-[50px]"
-  const textClasses = isPopup ? "" : "md:text-[20px]"
+  const textClasses = !isPopup && "md:text-[20px]"
 
   return (
     <div className="flex gap-x-[15px] md:gap-x-[40px] items-end">

diff --git a/components/WebCam/WebCam.tsx b/components/WebCam/WebCam.tsx
@@ -38,7 +38,7 @@ const WebCam = () => {
           className="w-full h-full flex justify-center items-center"
           onClick={onClick}
         >
-          <p className="text-white text-xl">Verify Identify</p>
+          <p className="text-white text-xl">Verify Identity</p>
         </button>
       )}
       {granted && (