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

Updated appicons.icns #3927

Closed
wants to merge 1 commit into from
Closed

Updated appicons.icns #3927

wants to merge 1 commit into from

Conversation

ismhdez
Copy link

@ismhdez ismhdez commented May 23, 2022

Modified OSX icons to the new Icon Type (Big Sur) -- It's better integrated in the actual versions of MacOS.

New Icon Old Icon

Dock:

Launchpad:

@selsta
Copy link
Collaborator

selsta commented May 23, 2022

Could you take a look at #3560 ? Which one do you prefer?

@ismhdez
Copy link
Author

ismhdez commented May 23, 2022

Could you take a look at #3560 ? Which one do you prefer?

Circled icon should not be the default one anymore, since macOS Big Sur all icons were changed to rounded squares:
Concept

I think my suggestion fits more with the new macOS look, the app name should be "Monero Wallet.app" or something like that too, yes.

@ismhdez
Copy link
Author

ismhdez commented May 28, 2022

Any news regarding the PR?

@selsta
Copy link
Collaborator

selsta commented May 29, 2022

It takes a while until things get merged, will still check which one of the two I prefer.

Copy link
Collaborator

@selsta selsta left a comment

Choose a reason for hiding this comment

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

Please rebase and set file permission to 644

@ismhdez
Copy link
Author

ismhdez commented Jun 10, 2022

Fixed, rebased and fixed file permissions (appicon.icns -> 644)

@selsta
Copy link
Collaborator

selsta commented Jun 10, 2022

Do you know how to squash?

@ismhdez
Copy link
Author

ismhdez commented Jun 10, 2022

Do you know how to squash?

Uhm, nope

@selsta
Copy link
Collaborator

selsta commented Jun 10, 2022

git rebase -i HEAD~2

then set the second commit to "s" for squash and force push.

@ismhdez
Copy link
Author

ismhdez commented Jun 10, 2022

git rebase -i HEAD~2

then set the second commit to "s" for squash and force push.

Should I do the git rebase from the upstream, right? (git rebase -i HEAD~2 upstream/master)

@selsta
Copy link
Collaborator

selsta commented Jun 10, 2022

just git rebase -i HEAD~2 should work, does it not?

@ismhdez
Copy link
Author

ismhdez commented Jun 10, 2022

If I do the rebase like you're saying, the appicon.icns file is the one I'm requesting, so I cannot commit it again. What do you want me to is a rebase from your fork (where the appicon.icns is different), and commit mine's with file permission as 644? (squash & force push) 🤔

@selsta
Copy link
Collaborator

selsta commented Jun 11, 2022

basically I want 1 commit that doesn't have any merge conflicts

Modified OSX icons to the new Icon Type (Big Sur)

Fixed file permissions
@ismhdez
Copy link
Author

ismhdez commented Jun 14, 2022

basically I want 1 commit that doesn't have any merge conflicts

That commit is ok for you?

@selsta
Copy link
Collaborator

selsta commented Jun 14, 2022

yes, thanks

@ismhdez ismhdez closed this by deleting the head repository Aug 1, 2024
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