Hey Matt, looks great, just need to rebase in christine's last commit that was merged. Also, I noticed that your TopNavBar doesn't reflect the changed I made in the pull request that you rebased in. You should probably check to make sure any other merge conflicts were not accidentally overwritten.
i.e. on the dev branch the profile icon isn't there on the top nav bar, but on your topnavbar it is still there despite rebasing.
Once you fix those Ill merge this in. the side nav looks great.
Hey Matt, looks great, just need to rebase in christine's last commit that was merged. Also, I noticed that your TopNavBar doesn't reflect the changed I made in the pull request that you rebased in. You should probably check to make sure any other merge conflicts were not accidentally overwritten.
i.e. on the dev branch the profile icon isn't there on the top nav bar, but on your topnavbar it is still there despite rebasing.
Once you fix those Ill merge this in. the side nav looks great.