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.

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

Nav bar fix #55

Merged
merged 6 commits into from
Oct 20, 2024
Merged

Nav bar fix #55

merged 6 commits into from
Oct 20, 2024

Conversation

limcaaarl
Copy link

Description

  • Fixed the hamburger issue by replacing menubar item with menu component
  • Downloaded poppins font locally

@samuelim01 samuelim01 self-requested a review October 20, 2024 09:13
Copy link

@samuelim01 samuelim01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, shall we redirect this PR to main directly though?

@limcaaarl limcaaarl changed the base branch from merge-all-in to main October 20, 2024 11:44
@limcaaarl
Copy link
Author

LGTM, shall we redirect this PR to main directly though?

This branch was from merge-all-in and there's some merge conflicts when merging with main. I think I will wait for the match-service merge first before merging this one, in case I make some merge conflict mistakes.

@samuelim01 samuelim01 merged commit 374d8da into main Oct 20, 2024
4 checks passed
@samuelim01 samuelim01 deleted the nav-bar-fix branch October 20, 2024 15:40
KhoonSun47 added a commit to KhoonSun47/cs3219-ay2425s1-project-g03 that referenced this pull request Oct 23, 2024
* main:
  Nav bar fix (CS3219-AY2425S1#55)

# Conflicts:
#	compose.yml
#	frontend/package-lock.json
#	frontend/package.json
#	frontend/src/app/app.routes.ts
@limcaaarl limcaaarl self-assigned this Nov 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants