-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Removed deprecated .png file #9246
Conversation
Hi @Spedi ! Quick heads-up re: the As soon as you update your master branch and rebase this one, the translations file will now be up to date and the test will pass, and you won't encounter this issue again with any branches off the updated master. 🙂 Steps to follow if needed:
|
Thank you so much @rebecca-shoptaw! |
@Spedi Yes one last step! You can push the new changes to the PR as you normally would with a And you shouldn't encounter something like this again, but this whole process is great to follow anytime you're returning to a PR you haven't worked on for a while or making a new branch -- keeps everything nice and up to date. |
background-repeat: no-repeat; | ||
background-position: 100% 0; |
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.
background-repeat: no-repeat; | |
background-position: 100% 0; |
Lets also remove these two since they don't do anything.
@Spedi
@Spedi Quick update! It looks like the remote version your
Once this is done, you should be able to switch to your branch and get it up to date as described:
Or P.S. Because your PR does involve removing translated text from the site (the alt and title for the icon), the pre-commit hook should successfully update the translation file for you when the PR is submitted. |
@rebecca-shoptaw done the steps, does everything look right now? |
@Spedi thanks for running those commands! Weirdly it looks like some of them must have failed, as your remote master branch is still showing as out of date: Happy to go back-and-forth on Slack or here to get this figured out! A question to get us started: When you're on the local master branch (in VSCode or whatever IDE you use) and you navigate to the
If so, your local master is up to date, and it will just be a matter of getting your remote master and local/remote branch for the PR to match. If not, I can help you get your local master back up to date and work from there. 🙂 |
@rebecca-shoptaw I see |
@Spedi All good! The following should fix it:
You can check the date on the |
@rebecca-shoptaw I done those steps on git, but it doesn't seem like it's working, the |
pre-commit.ci run |
@Spedi, I can't tell if you can fix this by simply running We may need to change the pre-commit rule a bit if #9258 doesn't stop this from happening. |
@Spedi Very weird that the upstream pull isn't going through! I'll start a back and forth with you in Slack so you can send screenshots/etc. and we can figure it out. 🙂 And I can confirm that the error messages @scottbarnes noticed, while annoying and on their way to being fixed, shouldn't be what's holding this up! Once the branch is correctly up to date you should be all good. |
for more information, see https://pre-commit.ci
It looks like something got tangled with your master branch @Spedi ; this can happen when one accidentally commits something to the local master branch. Run this to clean it up to avoid issues in future PRs: git checkout master
git fetch upstream master
git reset --hard FETCH_HEAD This resets it to be identical to the internetarchive/openlibrary master branch. I've fixed up this branch now since it's a small branch which we should be able to quickly merge 👍 |
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.
Closes #9237
Removed usages of
icon_cancel.png
, since it doesn't exist and it was still referenced in some part of the codebase.Stakeholders
@RayBB