Closed goss-gowtham closed 6 years ago
Hey @ezioda004 , What is SS? Resolve the conflict in the sense? Can you Elaborate it?
@goss-gowtham, SS means screen shot. Check your pull request for conflicts.
I didn't get any conflicts and I've Screenshot the Change I made already!
Hi @goss-gowtham, as @abhishekakade mentioned, please add SS of how the page was before. Its easy to look at the changes you've made. You need to resolve the conflict, synchronize your repo. Please read our guide on how to synchronize the fork here.
I've removed the Blur Property used which affected NavBar and Image style, and added Opacity to image only and Not the texts. Added Underline as per the mockup for the words Challenge and Practice . Conflict is resolved, which was raised after merging the last PR from the other guy.
I'm now getting This branch has no conflicts with the base branch, With few commits. Thanks for the review, and expecting more if any. It is ready to merge!!!
I've updated Home page as per the mock up by,
removing the Blur filter which affected whole navbar and images and replaced with Opacity for only image and not the text.
Added Underline as per the mockup with line-spacing which enhances the home page.
Didn't fix the Horizontal scroll issue as it's assigned to someone else.