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

Navbar SignUp and Logo issue solved #563

Merged
merged 6 commits into from
Dec 25, 2022
Merged

Navbar SignUp and Logo issue solved #563

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
54d6d0c
[Bug] Two Navbar issue solved
AbhiPatel10 Dec 17, 2022
5276877
[BUGS] Navbar Responsive Done
AbhiPatel10 Dec 17, 2022
9cd0de9
Merge branch 'IAmTamal:main' into main
AbhiPatel10 Dec 20, 2022
0bce122
Navbar SignUp and Logo issue solved
AbhiPatel10 Dec 20, 2022
1a07e29
Merge branch 'main' into main
tamalCodes Dec 22, 2022
195a23c
[UPDATE] Navbar Signup Hover Issue Solve and Responsive Navbar Update
AbhiPatel10 Dec 22, 2022
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
29 changes: 15 additions & 14 deletions src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ const Navbar = () => {
<>
<nav className="navbar navbar-expand-lg navbar-light sticky-top navbar_main ">
<div className="container">
<img
src={
solidarity ||
"https://www.shareicon.net/data/512x512/2016/09/15/829452_user_512x512.png"
}
onClick={() => window.location.replace("/")}
alt="Milan-logo"
className="nav_bramhin_img"
/>
<Link to={"/"}>
<img
src={
solidarity ||
"https://www.shareicon.net/data/512x512/2016/09/15/829452_user_512x512.png"
}
alt="Milan-logo"
className="nav_bramhin_img"
/>
</Link>

<button
className="navbar-toggler"
Expand Down Expand Up @@ -88,11 +89,6 @@ const Navbar = () => {
}
></div>
</li>

<button className="btn btn-warning nav_signup_btn">
Sign up
</button>

{/* Render Contact Us in Navabr only for Login and Register Pages */}
{(location.pathname === "/user/login" ||
location.pathname === "/user/register" ||
Expand All @@ -108,6 +104,11 @@ const Navbar = () => {
></div>
</li>
)}
<li className="nav-item home">
<Link to="/user/register">
<button className="btn nav_signup_btn">Sign up</button>
</Link>
</li>

{(Cookies.get("token") || Cookies.get("club")) && (
<img
Expand Down
23 changes: 8 additions & 15 deletions src/styles/Navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
}

.home {
margin: auto;
font-weight: 600;
margin-right: 30px;
margin: auto;
padding-right: 30px;
}

.shop_icon {
Expand All @@ -58,6 +58,10 @@
.navbar-brand {
font-size: 1.7rem;
}
.home {
margin: auto;
padding: 8px;
}
}

.nav_bramhin_img {
Expand Down Expand Up @@ -91,24 +95,13 @@
font-family: Poppins, sans-serif;
border: none;
border-radius: 6px;

padding: 10px 20px;
text-decoration: none;
color: rgba(0, 0, 0, 0.896);
font-weight: 600;
cursor: pointer;
/* width: 30%; */
}

.nav_signup_btn:hover {
background: #e26959;
box-shadow: 0 0 50px -10px #9747ff14;
font-family: Poppins, sans-serif;
border: none;
border-radius: 6px;

padding: 10px 20px;
color: rgba(0, 0, 0, 0.896);
font-weight: 600;
cursor: pointer;
width: 30%;
background: #f68475;
}