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 navbar #311

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −8
Open

Fix navbar #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3ac99a
fixed navbar at top and added hover effect
Utsavladia Aug 9, 2024
28fde84
fixed for mobile screen
Utsavladia Aug 9, 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
2 changes: 1 addition & 1 deletion frontend/src/components/HomeComponents/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Logo from '../../assets/images/logo-large.png'
import NavList from './NavList'
export default function NavBar() {
return (
<div className=' flex justify-between'>
<div className='md:fixed md:top-0 md:left-0 md:px-40 md:z-50 relative md:bg-[#012478] md:w-screen flex justify-between'>
<div className='text-white flex flex-row items-center'>
<img src={Logo} alt='logo' className='w-10'/>
<div className='text-white text-2xl font-Roboto font-semibold ml-2'>ChatBox</div>
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/components/HomeComponents/NavList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ export default function NavList() {

return (
<div>
<div id="menulinks" class="menulinks duration-500 md:static md:min-h-fit absolute min-h-[28vh] left-[0%] top-[-100%] md:w-auto w-[100%] flex justify-center py-5 fixed ">
<div id="menulinks" class="menulinks fixed top-[8%] duration-500 md:static md:min-h-fit w-[100%] left-[0%] min-h-[28vh] md:w-auto flex justify-center py-5 ">
<ul className="flex md:flex-row flex-col md:items-center md:gap-[4vw] gap-8 text-white font-Roboto font-semibold ">
<li>
<li className="hover:text-[#FFCC33]">
<NavLink
to="/"
className={({ isActive }) => (isActive ? "text-[#FFCC33]" : "")}
>
Product
</NavLink>
</li>
<li>
<li className="hover:text-[#FFCC33]">
<NavLink
onClick={() => {
ScrollDown();
Expand All @@ -36,10 +36,10 @@ export default function NavList() {
Services
</NavLink>
</li>
<li>
<li className="hover:text-[#FFCC33]">
<NavLink to="/login">Login</NavLink>
</li>
<li>
<li className="hover:text-[#FFCC33]">
<NavLink to="/signup">Signup</NavLink>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useNavigate } from 'react-router-dom'
export default function Home() {

const navigate=useNavigate();
const [isLoading,setIsLoading]=useState(true);
const [isLoading,setIsLoading]=useState(false);

useEffect(()=>{

Expand Down Expand Up @@ -39,7 +39,7 @@ export default function Home() {
return (
<div>
{isLoading&&<LoadingPage></LoadingPage>}
{!isLoading&&(<><div className='h-[100vh] px-40 py-5 max-[885px]:px-20 max-[653px]:px-14 bg-[#012478]'>
{!isLoading&&(<><div className='h-[100vh] px-40 py-5 md:pt-24 max-[885px]:px-20 max-[653px]:px-14 bg-[#012478]'>
<NavBar/>
<Description></Description>
</div>
Expand Down