Skip to content

merge Develop into master #41

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

Merged
abhishek-nexgen-dev merged 6 commits into from
Jan 16, 2025
Merged

merge Develop into master #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
beed95c
Merge pull request #35 from Code-With-Abhishek-Kumar/Docs/Update_Mult…
abhishek-nexgen-dev Jan 15, 2025
d386dc7
Merge pull request #37 from Code-With-Abhishek-Kumar/master
abhishek-nexgen-dev Jan 16, 2025
2de8652
style: Enhance UI components with cursor styles and responsive adjust…
Dev-Sameer-Khan Jan 16, 2025
0ad1e69
Modified: Update UI components for improved layout and responsiveness
Dev-Sameer-Khan Jan 16, 2025
3757fb6
Merge branch 'develop' into about
abhishek-nexgen-dev Jan 16, 2025
be4385a
Merge pull request #40 from Code-With-Abhishek-Kumar/about
abhishek-nexgen-dev Jan 16, 2025
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
1 change: 1 addition & 0 deletions src/components/Notice_Card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const Notice_Card = ({
fontWeight={900}
size={20}
onClick={Handle_Clone_Btn}
className='cursor-pointer'
/>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Testimonials.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const Testimonials = () => {
key={testimonial.id}
className='relative w-full flex justify-center'
>
<div className='card w-[30vw] max-[599px]:w-full bg-white text-black rounded-xl px-6 py-8 transform transition-all duration-300'>
<div className='card cursor-grab w-[30vw] max-[599px]:w-full bg-white text-black rounded-xl px-6 py-8 transform transition-all duration-300'>
<div className='profile flex items-center gap-4'>
<div className='image w-[3.5vw] max-[599px]:w-[12vw] h-[3.5vw] max-[599px]:h-[12vw] rounded-full overflow-hidden'>
<img
Expand Down
8 changes: 5 additions & 3 deletions src/components/aboutComponents/CampusFacilities.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ export let Facilites_Card = ({
}) => {
return (
<div
className='Facilites_Card flex gap-3 w-full h-full max-[1098px]:w-[40%]'

className='Facilites_Card flex gap-3 w-full h-full'

key={index}
>
<img
Expand Down Expand Up @@ -68,7 +70,7 @@ const CampusFacilities = () => {
)}
</div>
</div>
<div className='right w-[82.5%] max-[599px]:w-full text-white px-8 max-[599px]:px-0 h-full flex items-start justify-between flex-col gap-8'>
<div className='right w-[82.5%] max-[599px]:w-full text-white px-8 max-[599px]:px-0 h-full flex items-start justify-between flex-col gap-6'>
<div className='facilities'>
<h1 className='text-[1.2vw] max-[599px]:text-[5vw] font-semibold font-[Montserrat] mb-2'>
Capmus and Faciities
Expand Down Expand Up @@ -105,7 +107,7 @@ const CampusFacilities = () => {
</p>
</div>
<div className='discription w-full h-full flex max-[599px]:flex-col items-start justify-start gap-7'>
<div className='img-container w-[11vw] max-[599px]:w-full h-[11vw] max-[599px]:h-[45vw] bg-[#FFE7E7] rounded-2xl'>
<div className='img-container w-[10vw] max-[599px]:w-full h-[10vw] max-[599px]:h-[45vw] bg-[#FFE7E7] rounded-2xl overflow-hidden'>
<img
src={Description.image}
alt=''
Expand Down
8 changes: 3 additions & 5 deletions src/components/aboutComponents/Courses.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const Courses = () => {
Our Courses
</div>

<p className='text text-[1vw] max-[599px]:text-[3.3vw] font-[Poppins] w-[40%] max-[599px]:w-full text-center pb-8'>
<p className='text text-[1vw] max-[599px]:text-[3vw] font-[Poppins] w-[40%] max-[599px]:w-[90%] text-center pb-8'>
We have a group of eminent
Faculty members with great
personality and excellence in
Expand All @@ -61,12 +61,10 @@ const Courses = () => {
spaceBetween={30}
centeredSlides={true}
autoplay={{
delay: 1000,

delay: 5000,
disableOnInteraction: true,
}}
pagination={{
clickable: true,
}}
loop={true}
modules={[Autoplay]}
className='mySwiper'
Expand Down
16 changes: 8 additions & 8 deletions src/components/aboutComponents/History.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@ const History = () => {
History
</h1>

<p className='history_Para_One text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='history_Para_One text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!history.paragraph_First
? 'Not Found Paragraph One'
: history.paragraph_First}
</p>

<p className=' history_Para_Two text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className=' history_Para_Two text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!history.paragraph_Second
? 'Not Found Paragraph Two'
: history.paragraph_Second}
</p>

<p className='history_Para_Three text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='history_Para_Three text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!history.paragraph_Third
? 'Not Found Paragraph Three'
: history.paragraph_Third}
</p>

<p className='history_Para_Four text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='history_Para_Four text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!history.paragraph_Four
? 'Not Found Paragraph Four'
: history.paragraph_Four}
Expand All @@ -70,25 +70,25 @@ const History = () => {
: Vision.title}
</h1>

<p className='vision_Para_First text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='vision_Para_First text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!Vision.paragraph_First
? 'Vision Para fist Not Found'
: Vision.paragraph_First}
</p>

<p className='vision_Para_Second text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='vision_Para_Second text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!Vision.paragraph_Second
? 'Vision Para Second Not Found'
: Vision.paragraph_Second}
</p>

<p className='vision_Para_Third text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='vision_Para_Third text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!Vision.paragraph_Third
? 'Vision Paragraph Third Not Found'
: Vision.paragraph_Third}
</p>

<p className='vision_Para_Four text-[0.9vw] max-[599px]:text-[2.5vw] font-[Poppins] text-[#333]'>
<p className='vision_Para_Four text-[0.9vw] max-[599px]:text-[3vw] font-[Poppins] text-[#333]'>
{!Vision.paragraph_Four
? 'Vision Paragraph Four Not Found'
: Vision.paragraph_Four}
Expand Down
11 changes: 5 additions & 6 deletions src/components/aboutComponents/Teachers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const Teachers = () => {
<div className='title text-[3.5vw] font-semibold max-[599px]:text-[10vw]'>
Our Teachers
</div>
<p className='text text-[1.3vw] w-[50%] max-[599px]:w-full max-[599px]:font-light text-center max-[599px]:text-[3.3vw]'>
<p className='text text-[1.3vw] w-[50%] max-[599px]:w-[90%] max-[599px]:font-light text-center max-[599px]:text-[3vw]'>
We have a group of eminent
Faculty members with great
personality and excellence in
Expand All @@ -165,11 +165,10 @@ const Teachers = () => {
spaceBetween={30}
centeredSlides={true}
autoplay={{
delay: 1000,
disableOnInteraction: false,
}}
pagination={{
clickable: true,

delay: 5000,
disableOnInteraction: true,

}}
loop={true}
modules={[
Expand Down