Sparsh1212 / gsocanalyzer

A blazingly fast tool to analyze all the selected organizations in Google Summer of Code in the form of graphical analytics.
MIT License
75 stars 39 forks source link

fixed footer issue #76

Open sauravrajleaf opened 2 years ago

sauravrajleaf commented 2 years ago

Issue

Fixes #75

Description

New content container add to Home & Bookmarked. Modified footer css.

Type of change

Screenshot

Screenshot_Mozilla Firefox_50 Screenshot_Mozilla Firefox_51 Screenshot_Mozilla Firefox_52 Screenshot_Mozilla Firefox_53

Checklist:

sauravrajleaf commented 2 years ago

Please check if this can be merged.

Sparsh1212 commented 2 years ago

Please remove the merge conflicts too.

sauravrajleaf commented 2 years ago
sauravrajleaf commented 2 years ago

Regarding the last part pushing them to my PR. I did not understand that very well.

If it's the later one, I have no idea to how to push changes to same PR. Can you please guide me through. Thanks.

Sparsh1212 commented 2 years ago
  • As per the instructions, I have reverted all the changes done in all the files which was affected due to the code editor format on save. Later, I made changes to the required CSS.
  • Also regarding the merge conflict it was occurring in Home.js file which was also changed by the editor on save option as per my knowledge. So, in my opinion reverting everything would have solved that too.

Just a correction to your second point: The merge conflict is not due to the editor. It occurs when someone also proposed some changes on the same line of code that you were working and his/her changes got merged before you. That's why you faced a merged conflict. To resolve this, I'd suggest you to watch any tutorial on "How to resolve merge conflicts"

Sparsh1212 commented 2 years ago

Regarding the last part pushing them to my PR. I did not understand that very well.

  • Should I make a new PR & close this one?
  • Should I commit the changes to same PR?

If it's the later one, I have no idea to how to push changes to same PR. Can you please guide me through. Thanks.

By pushing I meant, just do a new commit to your current PR and push those latest changes. By pushing, your newly added commits will also reflect here, and I will be able to see your updated code.

sauravrajleaf commented 2 years ago

I've done the changes. Please check once. I hope this time it's right.