Closed michaelclapham closed 3 years ago
Could you remove the .cache folder from this PR and add it to the .gitignore file?
@jtoaha this branch had several conflicts at the moment. Would you like to take a look at resolving them?
Let me know if you'd like some help with the process for working through resolving conflicts.
Sure, I should be able to resolve it. Thanks so much. Just taking care of multiple issues, made commits to keep the changes a bit separate. I still have to do the new updates for the navbar. Once I do that I'll follow up.
Note: The above commits mainly include changes to the navbar as well as to articles. Also added the Linaria library for zero run-time CSS for future use.
Resolved Merge Conflict. As expected, some of our stylings overlapped. So adjusted CSS as needed. Also for the Login Modal, carried Desktop styling into Tablet mode. And, for a more seamless experience, used javascript to close out desktop/ tablet Login Modal (if it's open) when switching to Feature or Mobile mode.
Our combined changes can be viewed at: https://unicef-iogt-pwa-v2.web.app/
Note: Can be merged into develop. But preferable if branch was not deleted. Navbar changes still need to be done. Next thing I'll be working on over the next day
Multilevel Navbar:
Articles Component: