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

OpenID connect icon to SVG #4795

Merged
merged 1 commit into from
May 19, 2024

Conversation

hiddewie
Copy link
Contributor

@hiddewie hiddewie commented May 14, 2024

Part of #850

Split off from #4775

This pull request replaces PNG icons for the OpenID icons with their minimized SVG variants, to ensure screens with high pixel densities can display the OpenStreetMap website with beautiful graphics.

Tested on http://127.0.0.1:3000/login

image

image

@hiddewie hiddewie changed the title OpenID connect icons to SVG OpenID connect icon to SVG May 14, 2024
@hiddewie hiddewie marked this pull request as ready for review May 14, 2024 18:03
app/helpers/user_helper.rb Outdated Show resolved Hide resolved
@AntonKhorev
Copy link
Contributor

54cde47 - I thought the maintainers here like clean commit history...

Copy link
Collaborator

@gravitystorm gravitystorm left a comment

Choose a reason for hiding this comment

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

From CONTRIBUTING.md

  • Avoid including "fixup" commits. If you have added a fixup commit (for example to fix a rubocop warning, or because you changed your own new code) please combine the fixup commit into the commit that introduced the problem. git rebase -i is very useful for this.
  • Avoid including "merge" commits. If your PR can no longer be merged cleanly (for example, an unrelated change to Gemfile.lock on master now conflicts with your PR) then please rebase your PR onto the latest master. This allows you to fix the conflicts, while keeping the PR a straightforward list of commits. If there are no conflicts, then there is no need to rebase anything.

I know @tomhughes has fixed other pull requests already, but if you can fix these problems yourself before we review your PRs, then it makes it easier for everyone.

@hiddewie
Copy link
Contributor Author

but if you can fix these problems yourself before we review your PRs, then it makes it easier for everyone.

Sorry, I missed this part in the contributing guidelines. I am used to the Github feature to squash PRs into a single commit into the default branch, which uses the PR title and description as resulting commit.

I will squash my commits into a single commits from now on.

re-add whitespace

trigger CI

revert size attribute
@gravitystorm
Copy link
Collaborator

Sorry, I missed this part in the contributing guidelines. I am used to the Github feature to squash PRs into a single commit into the default branch, which uses the PR title and description as resulting commit.

No problem, thanks for making the changes

I will squash my commits into a single commits from now on.

If it's worth having multiple commits, then please keep using multiple commits! No need to squash unnecessarily. You'll see from many of the other PRs (e.g. https://github.com/openstreetmap/openstreetmap-website/pull/4680/commits) that we use multiple commits in order to do things like allow better git blame, allow us to cherry-pick or revert particular commits, allow explanations of one commit separately from the rest of them, etc etc.

Copy link
Member

@tomhughes tomhughes left a comment

Choose a reason for hiding this comment

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

Looks good to me now, thanks.

@tomhughes tomhughes merged commit 514836a into openstreetmap:master May 19, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants