Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Making required changes #200

Closed
wants to merge 3 commits into from
Closed

fix: Making required changes #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42d2e1f
fix: reduced Hero and Hamburger gap for mobile view,
Cybrite Oct 23, 2024
eb67a97
fix: added padding in stats table
Cybrite Oct 23, 2024
c1c2ad1
Merge branch 'main' into hero-and-Navfix
Srish-ty Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 32 additions & 14 deletions src/components/EventsPage/Gallery/CardWrapper.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,41 @@ export const GalleryWrapper = () => {
setCardSizes(sizes);
}, []);

return !isMobile ? (
<div
className='relative w-full'
style={{
padding: '1rem',
}}
>
<div className='flex flex-wrap gap-6 justify-start'>
return (
<div className='relative w-full p-4'>
<div
className={
isMobile
? 'flex overflow-x-auto gap-4 pb-4 -mt-24 snap-x snap-mandatory scrollbar-hide'
: 'flex flex-wrap gap-6 justify-start'
}
style={
isMobile
? {
scrollbarWidth: 'none',
msOverflowStyle: 'none',
WebkitOverflowScrolling: 'touch',
}
: {}
}
>
{GalleryData.map((item, index) => (
<div
key={index}
className='rounded-lg overflow-hidden'
style={{
width: `${cardSizes[index]?.width === 2 ? '32%' : '16%'}`,
minHeight: '300px',
flexGrow: 1,
}}
className={`rounded-lg overflow-hidden ${isMobile ? 'snap-center flex-none' : ''}`}
style={
isMobile
? {
width: '80vw',
minHeight: '300px',
maxWidth: '400px',
}
: {
width: `${cardSizes[index]?.width === 2 ? '32%' : '16%'}`,
minHeight: '300px',
flexGrow: 1,
}
}
>
<GalleryCard label={item} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/HeroSection/Hero.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const Hero = () => {
</motion.div>

<motion.div
className='absolute inset-0 z-20 flex flex-col items-center justify-center mt-32'
className='absolute inset-0 z-20 flex flex-col items-center justify-center xsm:mt-20 md:mt-32'
initial='hidden'
animate='visible'
variants={container}
Expand Down
14 changes: 7 additions & 7 deletions src/components/Statistics/card/card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { Table } from 'flowbite-react';

export const Card = () => {
return (
<div className='p-4 flex justify-center items-center'>
<div className='flex items-center justify-center p-4'>
<div
className='w-full max-w-7xl bg-black rounded-lg shadow-lg overflow-hidden'
className='w-full overflow-hidden bg-black rounded-lg shadow-lg max-w-7xl'
style={{ boxShadow: '0px 4px 31px 0px rgba(255, 255, 255, 0.25)' }}
>
<div className='p-4 sm:p-6 md:p-8 lg:p-10'>
<h2 className='text-center font-orbitron font-semibold text-white text-lg sm:text-xl md:text-2xl lg:text-3xl mb-4 sm:mb-6 md:mb-8'>
<h2 className='mb-4 text-lg font-semibold text-center text-white font-orbitron sm:text-xl md:text-2xl lg:text-3xl sm:mb-6 md:mb-8'>
Top Colleges Registered for Innovision
</h2>
<div className='overflow-x-auto'>
Expand All @@ -20,19 +20,19 @@ export const Card = () => {
{Topics.map((topic, index) => (
<Table.HeadCell
key={index}
className='font-orbitron font-bold text-center text-xs sm:text-sm md:text-base lg:text-lg py-2 sm:py-3 border-b border-gray-700'
className='py-2 text-xs font-bold text-center border-b border-gray-700 font-orbitron sm:text-sm md:text-base lg:text-lg sm:py-3'
>
{topic}
</Table.HeadCell>
))}
</Table.Head>
<Table.Body className='divide-y divide-gray-700'>
{Info.map((item, i) => (
<Table.Row className='hover:bg-gray-800 transition-all' key={i}>
<Table.Cell className='font-montserrat text-white text-center font-medium text-xs sm:text-sm md:text-base py-2 sm:py-3'>
<Table.Row className='transition-all hover:bg-gray-800' key={i}>
<Table.Cell className='py-2 text-xs font-medium text-center text-white font-montserrat sm:text-sm md:text-base sm:py-6 2xs:py-5'>
{item.Rank}
</Table.Cell>
<Table.Cell className='font-montserrat text-white text-center font-medium text-xs sm:text-sm md:text-base py-2 sm:py-3'>
<Table.Cell className='py-2 text-xs font-medium text-center text-white font-montserrat sm:text-sm md:text-base sm:py-3'>
{item.college}
</Table.Cell>
</Table.Row>
Expand Down
Loading