Skip to content

fix: correct zeebo icon resolution#5038

Merged
wescopeland merged 1 commit into
RetroAchievements:masterfrom
FIareon:master
Jul 7, 2026
Merged

fix: correct zeebo icon resolution#5038
wescopeland merged 1 commit into
RetroAchievements:masterfrom
FIareon:master

Conversation

@FIareon

@FIareon FIareon commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

When edits were being made in the original pull request, the icon was accidentally cropped to a 32x26 resolution, and I didn't notice. This leads the icon to get stretched vertically to match the frames on certain pages, such as game pages. This pull request adds 3 transparent pixels on the top and bottom, which should fix any stretching issues.

@wescopeland

Copy link
Copy Markdown
Member

It looks like you've opened this PR from your fork's master branch, which is now missing commits from this repo's master branch:

Screenshot 2026-07-03 at 10 47 12 AM

master generally needs to remain clean. Stuff gets merged into master, but it shouldn't ever be directly written to by a human. That's what causing a merge conflict here:

Screenshot 2026-07-03 at 10 46 33 AM

To make things smoother, I've repaired this PR so we can do the merge. Future PRs will need to be from separate branches off master. This allows for clean merges without conflicts. You'll notice every other PR does something similar:

Screenshot 2026-07-03 at 10 48 12 AM (cacheable-userpics, not master)

You can commit work to new branches by doing:

# create the branch
git checkout -b my-branch

# make your changes and commit them
git add .
git commit -m "some commit message here"
git push --set-upstream origin my-branch

# then open a PR in RAWeb from your fork's my-branch 

@wescopeland
wescopeland merged commit fdd5c56 into RetroAchievements:master Jul 7, 2026
21 checks passed
wescopeland pushed a commit that referenced this pull request Jul 10, 2026
When edits were being made in the original pull request, the icon was
accidentally cropped to a 32x26 resolution, and I didn't notice. This
leads the icon to get stretched vertically to match the frames on
certain pages, such as game pages. This pull request adds 3 transparent
pixels on the top and bottom, which should fix any stretching issues.
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.

2 participants