MLH-Fellowship / prep-project-4.1.3

MLH Prep Project for Pod 4.1.3
https://mlh-prep-4-1-3.netlify.app/
MIT License
3 stars 10 forks source link

added background themes #26

Closed neha-93 closed 2 years ago

neha-93 commented 3 years ago

this PR closes #2 #28

netlify[bot] commented 3 years ago

✔️ Deploy Preview for mlh-prep-4-1-3 ready!

🔨 Explore the source changes: 17aa2935033cdf9575c90b2f0b3819ed07e10aa8

🔍 Inspect the deploy log: https://app.netlify.com/sites/mlh-prep-4-1-3/deploys/619b7eea00c24e0008d27042

😎 Browse the preview: https://deploy-preview-26--mlh-prep-4-1-3.netlify.app

GrayFlash commented 3 years ago

@neha-93 in the preview I am not able to edit the name of city, can you check that once.

neha-93 commented 3 years ago

@GrayFlash I fixed the issue, can you check again

iamwyh2019 commented 3 years ago

Added the °C/°F toggle. Resolved conflicts. Ready for merging!

grace-omotoso commented 3 years ago

@iamwyh2019 @neha-93 not a good practice to implement two issues in one PR. I will merge this, just wanted to let you know it is important to separate concerns. This is a major issue, thanks to the team for getting this done

grace-omotoso commented 3 years ago

@neha-93 and co. Please, fix merge conflict and respond to Akshita's review

iamwyh2019 commented 3 years ago

It's a bit hard to change the toggle size since the toggle size is hard-coded in the package (height 24px). However I can make the logo and navbar larger so that it matches better. Does that work?

image

akshitadixit commented 3 years ago

@iamwyh2019 this looks good too 👍👍

iamwyh2019 commented 3 years ago

Sure. I will work on resolving conflicts.

iamwyh2019 commented 3 years ago

Conflicts resolved. Please merge.

grace-omotoso commented 2 years ago

@neha-93 Apologies, please, resolve the conflict again. I will merge once that is done. Thanks

iamwyh2019 commented 2 years ago

Our PR's a big update and its base is quite old so I'm worried that the mainstream's evolving too fast and making it virtually impossible to solve conflicts. Anyway, I will look at the conflicts tomorrow, and if things are messy, will try to redo our work on the newest mainstream.

neha-93 commented 2 years ago

resolved all the conflicts, ready for merging.