search

catppuccin / fleet

🌊 Soothing pastel theme for JetBrains Fleet
https://plugins.jetbrains.com/plugin/25081-catppuccin-fleet-theme
MIT License
111 stars 2 forks source link

fix: support Fleet 1.35 #13

Closed davfsa closed 5 months ago

davfsa commented 5 months ago

Mostly a large rewrite of all the theme to work in the new Fleet versions.

I have also fixed some theme issues where text would be hard to read (tweaked opacity) and incorrect colours were being used, as lack of specifying would cause it to fallback to Fleets default colour pallet.

There are also some removed fields as they are no longer supported (mainly per component disable colours, etc)

Any and all feedback is welcome! If you find any inconsistencies in the theme, please do let me know and I'll fix it!

Closes #11 Alternative to #12

kkrypt0nn commented 5 months ago

Not sure if your screenshots have some different colors than the actual colors of the application with the theme, but they're quite light compared to how they should be.

New Old
Screenshot_20240608-092217.png Screenshot_20240608-092229.png

If the theme effectively looks like that, there's something off, otherwise the screenshots quality is just low and should be remade in my opinion.

May be worth syncing with #12 as well, and make a single PR together.

Thanks

davfsa commented 5 months ago

I had a look through #12 and it's effectively the same pr as this one, but it contains a lot of fields that have been removed and do not longer work and still some button rounding errors that just simply porting the new theme to fleet 3.15 would cause.

I also don't know where the lighting changes come from, but I'll investigate! I havent tweaked any attribute colours, so they should be exactly the same, unless they were made lighter by Fleet.

davfsa commented 5 months ago

@kkrypt0nn It looks like the tool I was using to convert my screenshot png to webp (cwebp) kept a quality of 80% by default and was also lossy compression by default.

Changed those two things and now the colours should be much more vivid and close to the original picture.

Thanks for pointing it out!

thelooter commented 5 months ago

I had a look through #12 and it's effectively the same pr as this one, but it contains a lot of fields that have been removed and do not longer work and still some button rounding errors that just simply porting the new theme to fleet 3.15 would cause.

I also don't know where the lighting changes come from, but I'll investigate! I havent tweaked any attribute colours, so they should be exactly the same, unless they were made lighter by Fleet.

Is there anything in #12 that isn't in here? Otherwise I would go and close that other one. We might also wanna think about adding some blank lines between components so its a bit more maintainable.

davfsa commented 5 months ago

Is there anything in https://github.com/catppuccin/fleet/pull/12 that isn't in here? Otherwise I would go and close that other one.

From a quick look, it doesn't seem so. We even both included nice new things like the new smartMode theme style!

We might also wanna think about adding some blank lines between components so its a bit more maintainable.

Thought about that too, but the original did not seem to have the split lines to I decided not to. Seeing more people also find it hard to maintain due to this makes it actually worth spending the time to clean it up. Will make a commit with it :)

thelooter commented 5 months ago

Is there anything in #12 that isn't in here? Otherwise I would go and close that other one.

From a quick look, it doesn't seem so. We even both included nice new things like the new smartMode theme style!

Got it, will close my PR then

davfsa commented 5 months ago

Added spacing.

The only unfortunate side-effect is that the spacing is also added in the generated JSON.

It could be avoided by making the newline comments, but I dislike that approach. Maybe something could be added to whiskers to strip out empty lines?

thelooter commented 5 months ago

I don't mind having the whitespace in the generated json personally

davfsa commented 5 months ago

Added some missing button types that I seem to have missed and made the tabs look more like tabs. This means that the selected tab colour will now match the background of the component under it. This is more in line with how the rest of the builtin fleet themes look and I think it adds a nice touch.

Nonetheless, it also deviates a bit from the original theme, so feedback is welcome and I'll adjust based on it!

VictorTennekes commented 5 months ago

Nice work! Looks solid to me. I think maintaining the exact same look as the original one isn't necessary. I know this doesn't touch the exact same topic but the spirit of this comment by @backwardspy still goes I'd assume:

i wouldn't worry too much about going off-palette, the primary aim is for ports to capture catppuccin's look & feel rather than rigidly sticking to the preset colours. shades generated in either of these ways generally meet the criteria!

uncenter commented 5 months ago

@kkrypt0nn It looks like the tool I was using to convert my screenshot png to webp (cwebp) kept a quality of 80% by default and was also lossy compression by default.

Changed those two things and now the colours should be much more vivid and close to the original picture.

Thanks for pointing it out!

Yeah the solution is to add the -lossless flag :)

davfsa commented 5 months ago

The Hover on that keyboard button seems either extremly low contrast or doesn't exist.

You are absolutely right, it is way too low contrast when with that background. Im sorry for that!

Switched the hover/pressed colours for a switch to a lighter colour rather than a darker one (https://github.com/catppuccin/fleet/pull/13/commits/5ff993d37e3427c572d523c0f15e047e6912cb5b)