Update project page header 2355

[Jaretzbalba]

Fixes #2355

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

• Update HTML text to match new header text in Figma
• Update SCSS to match styling in Figma

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

[Jaretzbalba]

Blocker: Previous commits from a different issue somehow got grouped into this pull request. I'm not sure what is the best way to go about fixing this conflict.

[kathrynsilvaconway]

ETA: End of the day on 5/06
Availability: 2 hours

[Sparky-code]

hey @Jaretzbalba I'll take a look sometime today/tomorrow but can you reference the other issue that changes somehow got lumped in from?
(For redundancies sake, list out the ones that are supposed to have changes and the ones that were added by accident).

I'm assuming its these 3 that have no place in this PR:

_data/internal/credits/tools/so-go-survey.yml
_sass/components/_credit-items.scss
pages/credits.html

Avail: 1-2hrs
ETA: 5/05 EOD

[Jaretzbalba]

@Sparky-code The issue that got lumped into this PR was issue #3022/ PR #3043.

Yes, the files that shouldn't be included in this PR are:

_data/internal/credits/tools/so-go-survey.yml
_sass/components/_credit-items.scss
assets/images/credits/so-go-survey.png
pages/credits.html

[JessicaLucindaCheng]

@Jaretzbalba Try a git revert on the commit that shouldn't be in this pr and push to the branch update-project-page-header-2355. Then, check the Files Changed tab to make sure only the files/code you want changed is there.

Also, after that, I would recommend updating that branch with the latest changes from Hack for LA's gh-pages.

[JessicaLucindaCheng]

@SAUMILDHANKAR @tamara-snyder @answebdev @Sparky-code There is something weird going on with all the automations/checks not running, which there are usually 3 that run. (See "Checks" tab for this pr.) I'm not sure if it has something to do with the merge conflicts. However, I manually added the labels to help developers looking to review prs to know about the pr/issue by the labels.

[Jaretzbalba]

@JessicaLucindaCheng The git revert seems to have fixed the file issue. However, I can't seem to get this current branch to update with the latest changes from gh-pages. When I'm on the branch I'll check upstream and it claims it is already up to date; however, I can clearly see that files are missing from recent merges and my branch on GitHub even says that it's behind.

Terminal

GitHub

[Jaretzbalba]

The blocker was resolved during the team meeting on 5/10/22. @JessicaLucindaCheng recommended merging the upstream-gh-pages to my topic branch to have the most up-to-date files. However, since my gh-pages are a few commits ahead, I will need to refork this repo.

[Sparky-code]

Content changes look good on both mobile and and desktop. Links in the callouts work as expected and CSS is clean and works well. Happy to see the files issue was resolved as well.

Great job!

[tamara-snyder]

Availability: 1 hour
Review ETA: Wednesday, May 18

Edit: Apologies, I ran out of time to look at this yesterday. Updated review ETA: Thursday, May 19

[tamara-snyder]

Hi @Jaretzbalba, well done on this! The desktop and mobile versions look great. I left a couple of comments, but the main one is just that a tablet query may need to be added in order to accommodate about 40px of width where the paragraph spills off the page. You'll find a screenshot of the problem in my comment. Thanks for working on this! Feel free to request another review when you're ready.

[Sparky-code]

Avail: 2hrs
ETA: 5/27 EOD

[Sparky-code]

Sorry for the delay - Reviewing today

[Sparky-code]

@Jaretzbalba So I see that you made the correct changes, addressed the issue with tablet sizing and the resulting complication with the page to the unfinished 'about us' page. We did not get to discussing commenting out the section at the meeting today - assuming there are no issues that arise from it being commented out until the about us page is finished I would suggest we do that for this issue.

[JessicaLucindaCheng]

@Sparky-code We actually did discuss it in the meeting. Bonnie said to merge it onto the feature-homepage-launch branch. So, don't hide anything within a comment.

@Jaretzbalba So, now you will need to do the following:

• Merge the feature-homepage-launch branch into your topic branch update-project-page-header-2355 by doing the following:
  • Do the first two bullet points in Step #1. (Do NOT do the third bullet point shown in the Wiki page.)
  • Then, git checkout your topic branch
  • Then, do a git merge feature-homepage-launch
  • Then push changes to your topic branch on your forked repo
• Update the "into" branch in your pr by:
  • 1. By clicking the "Edit" button next to the pr
    Step 1 Image

    
  • 2. Change the "into" branch to feature-homepage-launch
  • 3. Click the "Save" button.
    Step 2 and 3 Image

    
• After doing all of the above, check that files in the Files changed tab are correct and should only contain the changes you made.

[Jaretzbalba]

@JessicaLucindaCheng Just to make sure I do this correctly should the {FEATURE BRANCH NAME} in the steps provided be feature-homepage-launch or update-project-page-header-2355?

[JessicaLucindaCheng]

@Jaretzbalba

@JessicaLucindaCheng Just to make sure I do this correctly should the {FEATURE BRANCH NAME} in the steps provided be feature-homepage-launch or update-project-page-header-2355?

feature-homepage-launch

[Sparky-code]

I see that the branch was updated to reflect the discussion had in the comments regarding that.

Changes appear to have been resolved

[kathrynsilvaconway]

ETA: End of day 6/20
Availability: 1 hour

[Sparky-code]

git checkout -b feature-homepage-launch upstream/feature-homepage-launch
git checkout -b Jaratzbalba-update-project-page-header-2355 feature-homepage-launch
git pull https://github.com/Jaretzbalba/website.git update-project-page-header-2355

[kathrynsilvaconway]

@Jaretzbalba Changes all look good locally and the links work. I see that you have pushed your changes to the correct feature branch as well. Overall, very nice work, Jaret. Thank you.