Merge branch 'master' into add-gallery

techmannih · Oct 11, 2024 · a064e17 · a064e17
2 parents a6b4e35 + cc5c6aa
commit a064e17
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 36 deletions.
diff --git a/components/About/about.js b/components/About/about.js
@@ -30,25 +30,24 @@ function About() {
 					</Paragraph>
 					<div className='mt-10 flex gap-4 sm:flex-col lg:justify-center'>
 						<a
-						href='https://opencollective.com/asyncapi/events/asyncapi-conference-on-tour-6b3c0aa1'
-						target='_blank'
-						rel='noreferrer'
+							className='flex justify-center'
+							href='https://opencollective.com/asyncapi/events/asyncapi-conference-on-tour-6b3c0aa1'
+							target='_blank'
+							rel='noreferrer'
 						>
 							<Button className='w-[200px]'>Become a sponsor now</Button>
 						</a>
-						<a href='/pdf/conf-2024.pdf' download= {`conf ${new Date().getFullYear()}.pdf`} >
-						<Button overlay={true} className='w-[240px] border'>
-						<div className='flex gap-2 justify-center'>
-						<div>
-							<Image src="/img/Download_icon.png" height={20} width={20} alt='Download-icon' objectFit='contain'/>
-						</div>
-						<div>
-							Sponsorship prospectus
-						</div>
-						</div>
+						<a className='flex justify-center ' href='/pdf/conf-2024.pdf' download={`conf ${new Date().getFullYear()}.pdf`} >
+							<Button overlay={true} className='w-[240px] border'>
+								<div className='flex gap-2 justify-center items-center'>
+									<Image src="/img/Download_icon.png" height={20} width={20} alt='Download-icon' objectFit='contain' />
+									<div>
+										Sponsorship prospectus
+									</div>
+								</div>
 							</Button>
 						</a>
-				</div>
+					</div>
 				</div>
 			</div>
 		</div>

diff --git a/components/Buttons/button.js b/components/Buttons/button.js
@@ -6,7 +6,7 @@ function Button({className, children, overlay, onClick, type, disabled}) {
 		  disabled={disabled}
 		  type={type}
 		  onClick={onClick}
-			className={`${overlay ? '' : 'gradient-bg'}  text-white h-[54px] rounded-md p-[8px] ${className}`}
+			className={`${overlay ? '' : 'gradient-bg'} flex items-center justify-center text-white h-[54px] rounded-md p-[8px] ${className}`}
       >{children}</button>
 	);
 }

diff --git a/components/Navbar/navbar.js b/components/Navbar/navbar.js
@@ -55,7 +55,7 @@ function Navbar() {
 			if (!isSubMenuHovered) {
 				setShow(null);
 			}
-		}, 300);  
+		}, 300);
 	};
 
 	const handleSubMenuEnter = () => {
@@ -121,21 +121,15 @@ function Navbar() {
                                        <span class="after:absolute after:-bottom-1 after:right-1/2 after:w-0 after:transition-all after:h-0.5 after:bg-white after:group-hover:w-3/6"></span>
 										{show === link.title && link.subMenu && (
 											<div
-												className='subMenu absolute z-[9] mt-8 w-[140px] rounded-md left-[-15px] gradient-bg px-2 py-1 flex flex-col justify-center space-y-0'
+												className='subMenu absolute z-[9] mt-8 w-[150px] rounded-md left-[-15px] gradient-bg px-2 py-1 flex flex-col justify-center space-y-0'
 												onMouseEnter={handleSubMenuEnter}
 												onMouseLeave={handleSubMenuLeave}
 											>
 												{link.subMenu.map((subL) => (
 													<Link href={subL.ref} key={subL.title}>
-														{link.subMenu.length === 1 ? (
-															<div className='h-[32px] flex items-center justify-center text-[16px] hover:scale-95 hover:translate-x-1 transition-all'>
-																{subL.title}
-															</div>
-														) : (
-															<div className='h-[32px] text-[16px] hover:scale-95 hover:translate-x-1 transition-all'>
-																{subL.title}
-															</div>
-														)}
+														<div className={`flex items-center ${link.subMenu.length === 1 ? "justify-center" : "justify-start"} min-h-[32px] text-[16px] hover:scale-95 hover:translate-x-1 transition-all`}>
+															{subL.title}
+														</div>
 													</Link>
 												))}
 											</div>

diff --git a/components/Speaker/guideline.js b/components/Speaker/guideline.js
@@ -54,7 +54,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
                       }}>
                           <div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
                               <h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
-                              <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
+                              <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
                           </div>
 
 
@@ -78,7 +78,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
                       }}>
                           <div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
                               <h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
-                              <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
+                              <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
                           </div>
                           {
                           virtual?<p className={`mt-8 text-md text-white ${show === i ? "block" : "hidden"}`}>{faq.av}</p>:  
@@ -102,7 +102,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
                   }}>
                       <div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
                           <h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
-                          <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
+                          <button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform  duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
                       </div>
                       {
 
@@ -114,7 +114,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
               </div>
           })}
       </div>
-     <div className='text-center mt-20'>
+     <div className='flex items-center justify-center text-center mt-20'>
      {cfp && <a href={name === 'online'? "/venue/online/register" :cfp}target={name=='Online'?"":'_blank'} rel='noreferrer'>
 							<Button className="x-8 m-2 w-[250px] text-center">Submit Talk Proposal</Button>
 		</a>}

diff --git a/components/Tickets/ticketCards.js b/components/Tickets/ticketCards.js
@@ -13,7 +13,7 @@ function TicketCards({ className, city }) {
         <div className='text-xl font-bold text-gradient'>{city.name}, {city.country}</div>
         <div className='mt-2 text-lg'>{city.date}</div>
       </div>
-      <div className='border-t h-20 border-dashed p-4 text-center'>
+      <div className='flex justify-center border-t h-20 border-dashed p-4 text-center'>
         {/* Show a button based on the event status */}
         {isEndedOrUpcoming ? (
           <Button disabled overlay={true} className='w-[200px] bg-gray-400'>

diff --git a/pages/index.js b/pages/index.js
@@ -154,7 +154,7 @@ export default function Home() {
 											enthusiastic audience!
 										</Paragraph>
 										<Link legacyBehavior href="https://apidays.typeform.com/to/ILJeAaV8?typeform-source=www.apidays.global#event_name=xxxxx">
-										<a target="_blank">
+										<a className='flex justify-center' target="_blank">
 											<Button className='mt-[80px] w-[244px] border border-gray card-bg'>
 											Apply as a Speaker
 											</Button>

diff --git a/pages/venue/[id].js b/pages/venue/[id].js
@@ -38,7 +38,7 @@ function Venue({ city }) {
 		<div>
 			<div className= {`w-full h-[500px] sm:h-[auto] ${city.name=='Online'?'bg-online':'bg-madrid'} bg-cover bg-center`}>
 				<div className='w-full h-full kinda-dark items-center flex flex-col justify-between'>
-					<div className='mt-[82px] container text-center flex flex-col items-center w-[1100px] lg:w-full sm:text-center'>
+					<div className='mt-[60px] container text-center flex flex-col items-center w-[1100px] lg:w-full sm:text-center'>
 						{city.name=='Online'?<Heading className='text-white'>
 							{city.name} {city.country}
 						</Heading>:

diff --git a/styles/globals.css b/styles/globals.css
@@ -1,9 +1,7 @@
+@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&family=Inter:wght@300;400&family=Work+Sans:wght@300;400;500;600;700&display=swap');
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400&family=Work+Sans:wght@300;400;500;600;700&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Work+Sans:wght@700&display=swap');
 
 :root{
     --bg-color: white;