Skip to content
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

Merged
merged 4 commits into from
Apr 27, 2023

Conversation

cng008
Copy link
Member

@cng008 cng008 commented Apr 12, 2023

Fixes #4253

What changes did you make and why did you make them ?

  • Replaced the Sustainable Development Goals (SDG) images so that the SDG svgs are the correct color and follow the United Nations' SDG guidelines.
    • Deleted peace-justice.svg from the assets/images/sdg directory
    • Added sdg16.svg to the assets/images/sdg directory
  • Updated the path to the SVG in the following files:
    • _includes/about-page/about-card-sustainability.html
    • _projects/311-data.md
    • _projects/access-the-data.md
    • _projects/engage.md
    • _projects/open-community-survey.md

Things to note:

Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

Visuals before changes are applied

sdg-before

Visuals after changes are applied

sdg-after

@cng008 cng008 changed the title sdg16 rename and replace image to correct color SDG 16: Rename and replace image with correct color one Apr 12, 2023
@github-actions
Copy link

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.

git checkout -b cng008-replace-sdg-images-4253 gh-pages
git pull https://github.com/cng008/website.git replace-sdg-images-4253

@github-actions github-actions bot added role: front end Tasks for front end developers Complexity: Medium P-Feature: About Us https://www.hackforla.org/about/ size: 0.25pt Can be done in 0.5 to 1.5 hours p-feature: SDGs SDGs wherever they appear on the site (they all use a color library, set of icons, etc.) labels Apr 12, 2023
@blulady blulady requested review from blulady and removed request for blulady April 12, 2023 21:04
@RyanGehris RyanGehris self-requested a review April 13, 2023 04:47
Copy link
Member

@RyanGehris RyanGehris left a 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!

@cng008
Copy link
Member Author

cng008 commented Apr 13, 2023

@RyanGehris Thanks for the heads up! I hope I was able to fix the merge conflict. Let me know if there are any issues.

@cng008 cng008 requested a review from RyanGehris April 13, 2023 20:29
Copy link
Member

@RyanGehris RyanGehris left a 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.

Current About Page

Screenshot 2023-04-13 at 5 12 15 PM

About Page after your changes

Screenshot 2023-04-13 at 5 12 24 PM

The changes you made to these pages are great!

@cng008 cng008 force-pushed the replace-sdg-images-4253 branch from 8b89fbd to 9a40cff Compare April 14, 2023 01:24
@cng008
Copy link
Member Author

cng008 commented Apr 14, 2023

@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.

@cng008 cng008 requested a review from RyanGehris April 14, 2023 01:28
RyanGehris
RyanGehris previously approved these changes Apr 14, 2023
Copy link
Member

@RyanGehris RyanGehris left a 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 blulady requested a review from mademarc April 19, 2023 02:29
@mademarc
Copy link
Member

Review ETA: 4/20/2023
Availability: 7:15PM

mademarc
mademarc previously approved these changes Apr 19, 2023
Copy link
Member

@mademarc mademarc left a 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

@cng008 cng008 dismissed stale reviews from mademarc and RyanGehris via ea55abb April 19, 2023 02:54
@LOSjr4 LOSjr4 self-requested a review April 20, 2023 17:37
@blulady
Copy link
Member

blulady commented Apr 20, 2023

Great work! The correct changes are made and the website looks as intended. Thank you for working on this issue!

Thanks for thoroughly reviewing this @RyanGehris, I appreciate your time. Do you mind leaving an approval in addition to your comment? Thank you!!!

@blulady
Copy link
Member

blulady commented Apr 20, 2023

@mademarc can you approve the PR in addition to your comment?

@LOSjr4
Copy link
Member

LOSjr4 commented Apr 20, 2023

Availability: M,T,TH 9AM-1PM
ETA: now

Copy link
Member

@LOSjr4 LOSjr4 left a 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 !

@LOSjr4
Copy link
Member

LOSjr4 commented Apr 20, 2023

@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.

Copy link
Member

@RyanGehris RyanGehris left a 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!

@RyanGehris
Copy link
Member

@blulady Thank you for letting me know that I forgot to actually approve the changes. I just did it. Sorry about that.

@blulady
Copy link
Member

blulady commented Apr 21, 2023

I did not see the sdg16.svg on About page's Sustainability section: https://www.hackforla.org/about/#sustainability
Is it just me?

Screenshot (411)

@mademarc
Copy link
Member

Availability: 4/20/2023
ETA: 7:05pm

Copy link
Member

@mademarc mademarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @blulady thank you for the heads up and as i have approved this also once again @cng008 good job on this.

@RyanGehris
Copy link
Member

@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.

@cng008
Copy link
Member Author

cng008 commented Apr 21, 2023 via email

@roslynwythe
Copy link
Member

@cng008 It appears that on the live site there is a problem with the grid layout:
image

and resolving that problem is out of the scope of your issue, so we'll create an ER to manage that going forward.

@roslynwythe roslynwythe merged commit 9ee659a into hackforla:gh-pages Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Complexity: Medium P-Feature: About Us https://www.hackforla.org/about/ p-feature: SDGs SDGs wherever they appear on the site (they all use a color library, set of icons, etc.) role: front end Tasks for front end developers size: 0.25pt Can be done in 0.5 to 1.5 hours
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SDG 16: Rename and replace image with correct color one
6 participants