Skip to content

fix: remove merge artifacts and resolve frontend issues #512

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

Open
keerthana266 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove merge artifacts and resolve frontend issues #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions client/src/components/Navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,12 @@ html[data-theme="dark"] .navbar-dropdown-menu a.active {
color: var(--muted);
text-decoration: none;
font-weight: 500;
font-size: 0.92rem; /* Slightly smaller to prevent wrapping */
padding: 0.3rem 0.6rem; /* Reduced padding to save horizontal space */
font-size: 0.92rem;
padding: 0.3rem 0.6rem;
border-radius: 6px;
transition: background-color 0.2s ease, color 0.2s ease;
}

html[data-theme="dark"] .navbar-theme-toggle:hover {
background: rgba(139, 180, 255, 0.12);
color: #8ab4ff;
Expand Down
1 change: 0 additions & 1 deletion client/src/pages/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import "./Home.css";
import './ScrollToTop.css';

const Home = () => {
feature/login-auth
const { isAuthenticated } = useAuth();


Expand Down
1 change: 0 additions & 1 deletion client/src/pages/Profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import './ScrollToTop.css';
import { useAuth } from "../context/AuthContext";

const Profile = () => {
feature/login-auth
const { user } = useAuth();


Expand Down