-
-
Notifications
You must be signed in to change notification settings - Fork 778
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SDG 16: Rename and replace image with correct color one #4495
SDG 16: Rename and replace image with correct color one #4495
Conversation
Want to review this pull request? Take a look at this documentation for a step by step guide! From your project repository, check out a new branch and test the changes.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed that there is a merge conflict in your code. Here is a resource on resolving merge conflicts that might be helpful. Please look into it, and then I will be able to approve your changes. Thank you for all the work you have done so far on this issue!
@RyanGehris Thanks for the heads up! I hope I was able to fix the merge conflict. Let me know if there are any issues. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The merge conflicts look like they were resolved, but now there is no img element for sdg16.svg that is meant to replace peace-justice.svg in the file _includes/about-page/about-card-sustainability.html
Here are screenshots of what I am seeing when viewing https://www.hackforla.org/about/#sustainability on my local computer.
The changes you made to these pages are great!
- Citizen Engagement page: https://www.hackforla.org/citizen-engagement
- 311 Data: https://www.hackforla.org/projects/311-data
- Access the Data: https://www.hackforla.org/projects/access-the-data
- Engage: https://www.hackforla.org/projects/engage
- Open Community Survey: https://www.hackforla.org/projects/open-community-survey
8b89fbd
to
9a40cff
Compare
@RyanGehris Good catch! I swear that was there when I merged it. I've added back the SVG, however the empty line at the end of the file was deleted for some reason. If this is an issue, let me know and I can try and fix it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work! The correct changes are made and the website looks as intended. Thank you for working on this issue!
Review ETA: 4/20/2023 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @cng008 the svg image was added well on the img elements correctly and it looks good
Thanks for thoroughly reviewing this @RyanGehris, I appreciate your time. Do you mind leaving an approval in addition to your comment? Thank you!!! |
@mademarc can you approve the PR in addition to your comment? |
Availability: M,T,TH 9AM-1PM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see all of the targeted peace-justice.svg where changed to sdg16.svg, and all of the new site pages appear the same as our current site albeit slightly scaled different which was expected.
I saw your note on the image not showing on _projects/access-the-data.md. That is a good observation. It is also true on our current website, so it's acceptable regarding what this issue requested. Good work @cng008 !
@cng008 go ahead and click that Re-request review button next to the reviewers who have not left an "approval" yet, so they're alerted that your changes are ready to be re-checked. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work! The correct changes are made and the website looks as intended. Thank you for working on this issue!
@blulady Thank you for letting me know that I forgot to actually approve the changes. I just did it. Sorry about that. |
I did not see the sdg16.svg on About page's Sustainability section: https://www.hackforla.org/about/#sustainability |
Availability: 4/20/2023 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@blulady I am seeing the same thing as you when using firefox. I typically check on chrome, safari, and a mobile device so I did not notice that. The changes were successful for Chrome, Safari, and Mobile on my local computer. |
Thank you @RyanGehris and @mademarc for approving again. It seems this PR
keeps getting merge conflicts as other PRs are getting merged before this
one. @blulady I will be OOO until Tuesday 4/25 and will look at it once
again then.
|
@cng008 It appears that on the live site there is a problem with the grid layout: and resolving that problem is out of the scope of your issue, so we'll create an ER to manage that going forward. |
Fixes #4253
What changes did you make and why did you make them ?
peace-justice.svg
from theassets/images/sdg
directorysdg16.svg
to theassets/images/sdg
directoryThings to note:
Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)
Visuals before changes are applied
Visuals after changes are applied