Skip to content

Commit

Permalink
Merge branch 'main' into team/initial-design
Browse files Browse the repository at this point in the history
  • Loading branch information
paardarshee authored Oct 28, 2023
2 parents 7d64d69 + f30a9be commit e5b900d
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Niraj Modi <[email protected]>
Jayanta Pandit <[email protected]>
Rajdip Sinha <[email protected]>
Shivam kumar Shaw <[email protected]>
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import ContactUs from "./components/contact/ContactUs";
import Footer from "./components/footer/Footer";
import Team from "./components/team/Team";
import Navbar from "./components/NavBar/NavBar";

function App() {
return (
<div>
<Navbar/>
<Team />
<ContactUs />
<Footer />
Expand Down
Binary file added src/Assests/gdsc-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/components/NavBar/NavBar.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react'
import Logo from '../../Assests/gdsc-logo.png'
const Navbar = () => {
return (
<div className='w-[100%] flex justify-center items-center py-6 relative'>
<div className='flex justify-center items-center absolute left-[5vw] gap-1'>
<img src={Logo} alt="image" className='h-[3.5rem]'/>
<h1 className='font-bold text-lg text-[#767676]'>GDSC AEC</h1>
</div>
<div style={{boxShadow:' 0 0 10px rgba(0, 0, 0, 0.2)'}} className=' px-[5em] rounded-full '>
<ul className=' flex justify-center items-center gap-12 drop-shadow-2xl text-sm h-[6.4vh] text-[#535353] transition-all delay-300'>
<li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>About us</li>
<li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Event</li>
<li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Our Team</li>
<li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Contact</li>
</ul>
</div>
</div>
)
}

export default Navbar
5 changes: 0 additions & 5 deletions src/components/Navbar.jsx

This file was deleted.

0 comments on commit e5b900d

Please sign in to comment.