-
Notifications
You must be signed in to change notification settings - Fork 25
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
Adds people nudge logo to collaborators #3358
Conversation
I couldn't commit the People Nudge logo for some reason, but I was able to place it in public/assets/people_nudge_logo.png. |
Can you expand on that? |
In the terminal, git status says that the logo is an "untracked change"; when I tried to do git add on the logo, it wouldn't add to the files staged for commit. |
Would be useful to see before and after screenshots. I really care about how logos are presented on the landing page... I can't tell what this looks like from the PR itself. |
Some notes:
|
@jonfroehlich Before and after images are attached to this comment. @misaugstad Tried a bunch of different things and the People Nudge logo should now be committed. |
Looks good! |
…Webpage into 3340-people-nudge-logo
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.
Just a few things to clean up!
app/views/index.scala.html
Outdated
</a> | ||
</div> | ||
@if("Columbus" == cityName){ | ||
@if("Taipei" != cityName && "New Taipei" != cityName && "Keelung" != cityName){ |
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.
Could you actually use cityId
instead of cityName
since the former is always guaranteed to be unique? That's also my bad for using cityName
to check for the logos that are specific to Columbus and Amsterdam (could you fix those for me too please? 😁)
app/views/index.scala.html
Outdated
</section> | ||
</section> | ||
} else { | ||
<section class="collaborator-images-container"> |
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.
Can you restructure the if/else statement so that we don't duplicate any HTML? You should be able to do something like what we do for Columbus. Any time we can prevent duplicated code, that's a win!
@1kechen now that I've merged your other PR with the alt text for images on the landing page, can you resolve the merge conflicts here and make sure that everything looks good? |
01e3a37
to
7c488c4
Compare
@1kechen it looks like when you dealt with merge conflicts, you must have deleted all your code relating to including the people nudge logo. This is definitely something that I expect you to catch before passing to me for a PR review. After fixing merge conflicts, I expect you to test that the PR still works, which would have revealed the issue. If you go to the "Files changed" tab for the PR, you will also see that your code is gone. Both of those are things I expect you to do before requesting a PR review. |
@misaugstad Sorry, I had an error when committing this weekend and the code must've disappeared after I recalled a few previous commits in this branch. I added everything back in and tested it, hope that everything works this time around! |
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.
Looks good, thank you!
Resolves #3340
Adds if-statement to collaborators section to determine whether to replace LIGA Peatonal with People Nudge.
Things to check before submitting the PR