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

Add media submodule and update icons #3

Merged
merged 2 commits into from
Apr 24, 2024

Conversation

brayo-pip
Copy link
Member

This pull request adds a media submodule and updates the icons.

Copy link
Member Author

@brayo-pip brayo-pip left a comment

Choose a reason for hiding this comment

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

Tauri supports the conversion of icons natively. I used that for the conversion.

@ErikBjare
Copy link
Member

Don't commit the derived icon images, they should be generated at build-time.

@brayo-pip
Copy link
Member Author

Done!. I should probably add the icons folder to .gitignore too... if the changes are not meant to be committed.

@brayo-pip
Copy link
Member Author

Done!. I should probably add the icons folder to .gitignore too... if the changes are not meant to be committed.

I actually can't do that it would break the initial build process, since the icons are only generated if the tauri is called from the make file.

@brayo-pip
Copy link
Member Author

I don't think there's an other commit to make. Merge?

@ErikBjare ErikBjare merged commit f9451e3 into ActivityWatch:master Apr 24, 2024
6 checks passed
@ErikBjare
Copy link
Member

Thanks!

@brayo-pip brayo-pip deleted the development branch April 24, 2024 13:05
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