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.

Sign up for GitHub

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

Jump to bottom

Add Catppuccin Frappe color theme #6445

Merged
merged 3 commits into from
Dec 28, 2024
Merged

Add Catppuccin Frappe color theme #6445

merged 3 commits into from
Dec 28, 2024

Conversation

DontBlameMe99
Copy link
Contributor

Add the catppuccin frappe color theme

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

closes #3915

Description

This pull request adds the catppuccin frappe color theme (found on https://catppuccin.com/palette)
This means that this adds:

  • One theme variant (Catppuccin Frappe)
  • The accent colors (Rosewater, Flamingo, Pink, Mauve, Red, Maroon, Peach, Yellow, Green, Teal, Sky, Sapphire, Blue and Lavender)

Screenshots

image
image

Testing

I have checked every screen I can find (if there are any things missing etc.) I have also checked every color contrast I could think of.

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) December 23, 2024 12:06
@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Dec 23, 2024
@absidue
Copy link
Member

absidue commented Dec 26, 2024

Please use the same email address that you have configured in GitHub when you commit, so that the commits are actually attributed to you (notice how GitHub doesn't show the commit as coming from your GitHub account).

auto-merge was automatically disabled December 26, 2024 18:59

Head branch was pushed to by a user without write access

@DontBlameMe99
feat: add catppuccin frappe color theme
4fa3665 
Adds the catppuccin frappe color theme
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) December 26, 2024 18:59
@DontBlameMe99
Copy link
Contributor Author

@absidue Changed. Thanks for letting me know :)

efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc requested changes Dec 27, 2024
View reviewed changes
Copy link
Member

Choose a reason for hiding this comment

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

Place it above Catppuccin Mocha

image

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Dec 27, 2024
efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc reviewed Dec 27, 2024
View reviewed changes
src/renderer/components/ThemeSettings.vue Outdated Show resolved Hide resolved
src/renderer/components/ThemeSettings.vue Outdated Show resolved Hide resolved
src/renderer/composables/colors.js Outdated Show resolved Hide resolved
src/renderer/helpers/colors.js Outdated Show resolved Hide resolved
auto-merge was automatically disabled December 27, 2024 22:09

Head branch was pushed to by a user without write access

@DontBlameMe99
refactor: move frappe above mocha
eac5a1c 
Moves the frappe variant above the mocha variant
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) December 27, 2024 22:09
@DontBlameMe99
Copy link
Contributor Author

done @efb4f5ff-1298-471a-8973-3d47447115dc

@efb4f5ff-1298-471a-8973-3d47447115dc
Copy link
Member

@kommunarr this is probably very out of scope of this PR. I noticed that the urls and open view the comments button are very different on each theme. Sometimes, white, blue, green, black. Seems to be a bit random could you maybe elaborate some more on this

VirtualBoxVM_sh4uIPESsF.mp4

efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc previously approved these changes Dec 28, 2024
View reviewed changes
Copy link
Member

Choose a reason for hiding this comment

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

LGTM thanks @DontBlameMe99 cant wait to see more of you :)

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Dec 28, 2024
@kommunarr
Copy link
Collaborator

@efb4f5ff-1298-471a-8973-3d47447115dc The page links are the --link-color variable which is just the --accent-color (Secondary Theme Color) - not sure why we have this one-time-use --link-color variable, but oh well. The comments button is --title-color which is base theme-dependent. For some reason, changing the secondary theme color is changing the rule for the comments button, which shouldn't be happening. You can inspect this more closely with the Dev Tools to see which CSS rules it's applying to figure out where that bug is coming from.

kommunarr
kommunarr requested changes Dec 28, 2024
View reviewed changes
src/renderer/themes.css Outdated Show resolved Hide resolved
@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Dec 28, 2024
auto-merge was automatically disabled December 28, 2024 10:58

Head branch was pushed to by a user without write access

fix: move from mochalight icon to frappelight
2bdcb40 
Moves from the mocha light icon to the frappe light icon.
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) December 28, 2024 10:58
@DontBlameMe99
Copy link
Contributor Author

Fixed @kommunarr. Thanks for pointing this out - I forgot to change it :)

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Dec 28, 2024
kommunarr
kommunarr approved these changes Dec 28, 2024
View reviewed changes
Copy link
Collaborator

@kommunarr kommunarr left a comment

Choose a reason for hiding this comment

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

Thanks for your work on this!

@FreeTubeBot FreeTubeBot merged commit 550ce77 into FreeTubeApp:development Dec 28, 2024
10 checks passed
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Dec 28, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kommunarr kommunarr kommunarr approved these changes

@ChunkyProgrammer ChunkyProgrammer ChunkyProgrammer approved these changes

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Catppuccin Frappe Theme
6 participants
@DontBlameMe99 @absidue @efb4f5ff-1298-471a-8973-3d47447115dc @kommunarr @ChunkyProgrammer @FreeTubeBot