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

Prepare cinnamon theme variants #3842

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Conversation

hsbasu
Copy link
Contributor

@hsbasu hsbasu commented Mar 15, 2023

  • set cinnamon component option to true
  • add colorable assets file
  • Update the meson build script to create variants
  • Follow the way gnome-shell variants are created
  • Not using directories cinnamon, cinnamon-dark, dark and default. Can be cleaned up later.

@hsbasu hsbasu force-pushed the cinnamon-add-variants branch from 8af3dc6 to eab4689 Compare March 15, 2023 14:54
@hsbasu
Copy link
Contributor Author

hsbasu commented Mar 15, 2023

Hi @Jupi007 The PR for cinnamon variants you requested. Please have a look. Looking at this, I think we should merge #3639 here. Because, we don't know when debian will merge my PR.

@Initu-Castilhos
Copy link

Captura de tela de 2023-03-16 03-32-59
The light version has a lot of contrast between the separator and the corner bar.
Captura de tela de 2023-03-16 03-33-27
The dark version is ok.
Captura de tela de 2023-03-16 03-41-11
The checked and radio are 24px and the radio is light in the dark version. Take a look at this P.R. done: #3794

Copy link
Member

@Jupi007 Jupi007 left a comment

Choose a reason for hiding this comment

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

Hi @hsbasu and thanks a lot for this PR!
This is much appreciated ❤️

I added some requested change.

@Jupi007
Copy link
Member

Jupi007 commented Mar 16, 2023

The light version has a lot of contrast between the separator and the corner bar.

@Initu-Castilhos Is this problem reproducible in master, or only in this PR?

@Jupi007
Copy link
Member

Jupi007 commented Mar 16, 2023

@hsbasu Thanks a lot to have applied my requested changes 🙂
I don't know why, but it looks like you messed up the commits because some of my previous PRs changes pop up here 🤔

@Initu-Castilhos Can you retest this PR, please?
I need to setup a cinnamon VM, but it could be nice to have a quicker feedback, especially for the separator problem.

@Initu-Castilhos
Copy link

@hsbasuMuito obrigado por ter aplicado minhas alterações solicitadas🙂 Não sei por que, mas parece que você estragou os commits porque algumas das minhas alterações anteriores de PRs apareceram aqui🤔

@Initu-CastilhosVocê pode testar novamente este PR, por favor? Preciso configurar uma VM canela, mas seria bom ter um feedback mais rápido, especialmente para o problema do separador.
👍🏼

@Initu-Castilhos
Copy link

A versão light tem muito contraste entre o separador e a barra de canto.

@Initu-CastilhosEste problema é reproduzível em master, ou apenas neste PR?

Master.

@hsbasu
Copy link
Contributor Author

hsbasu commented Mar 16, 2023

@hsbasu Thanks a lot to have applied my requested changes 🙂
I don't know why, but it looks like you messed up the commits because some of my previous PRs changes pop up here 🤔

@Initu-Castilhos Can you retest this PR, please?
I need to setup a cinnamon VM, but it could be nice to have a quicker feedback, especially for the separator problem.

Yes I know. Give me some time. I'll repush it. Please don't merge yet.

@Initu-Castilhos
Copy link

@hsbasuMuito obrigado por ter aplicado minhas alterações solicitadas ligeiramente_smiling_face
Não sei por que, mas parece que você estragou os commits porque algumas das minhas alterações anteriores de PRs apareceram aqui pensando
@Initu-CastilhosVocê pode testar novamente este PR, por favor?
Preciso configurar uma VM canela, mas seria bom ter um feedback mais rápido, especialmente para o problema do separador.

Sim eu sei. Me dê um tempo. Vou repô-lo. Por favor, não mescle ainda.

Captura de tela de 2023-03-16 12-38-57
The problem still exists.

@Initu-Castilhos
Copy link

Captura de tela de 2023-03-16 12-49-17
Captura de tela de 2023-03-16 12-49-25
It's not coloring.

@Initu-Castilhos
Copy link

Initu-Castilhos commented Mar 16, 2023

Maybe it's better to change the color of the panel and base it on the titlebar color like in Mint-Y. I think this makes it better to maintain the theme.

- set cinnamon component option to true
- add colorable assets file
- Update the meson build script to create variants
- Follow the way gnome-shell variants are created
- Remove unnecessary directories in cinnamon-shell:
  cinnamon, cinnamon-dark, dark and default.
@hsbasu hsbasu force-pushed the cinnamon-add-variants branch from efd36dc to 5fee171 Compare March 16, 2023 18:37
@hsbasu
Copy link
Contributor Author

hsbasu commented Mar 16, 2023

@Initu-Castilhos @Jupi007 @ItzSwirlz Corrected everything. Please have a look.

@Initu-Castilhos
Copy link

Captura de tela de 2023-03-16 16-12-50
Nothing yet.

@hsbasu
Copy link
Contributor Author

hsbasu commented Mar 16, 2023

Captura de tela de 2023-03-16 16-12-50 Nothing yet.

It's strange. I rebased all the scss files from the default folder. I was able to generate all the variants and assets properly. Let me try again.

@hsbasu
Copy link
Contributor Author

hsbasu commented Mar 16, 2023

@Initu-Castilhos @Jupi007 I get it now. Those colours are coming from the sass files and are not using accent_bg_colour as their base. To modify those colours, the sass files need to be modified. I have cross checked all the colorizable assests are taking accent colour. I would suggest to have a separate commit for them.

@Initu-Castilhos
Copy link

Initu-Castilhos commented Apr 2, 2023

@Initu-Castilhos @Jupi007Agora eu entendi. Essas cores vêm dos arquivos sass e não estão usando acent_bg_colour como base. Para modificar essas cores, os arquivos sass precisam ser modificados. Eu verifiquei se todos os recursos colorizáveis ​​estão usando cores de destaque. Eu sugeriria ter um commit separado para eles.

I found this project: https://github.com/dgsasha/dg-yaru

Captura de tela de 2023-04-02 23-18-02
Captura de tela de 2023-04-02 23-18-12
This style with floating menu and more rounded corners is very close to gnome-shell.

@hsbasu
Copy link
Contributor Author

hsbasu commented May 4, 2023

@Jupi007 A gentle reminder on the PR.

Copy link
Member

@Jupi007 Jupi007 left a comment

Choose a reason for hiding this comment

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

Hi @hsbasu,
sorry for the late reply.

Imo, this can be merged.
But I would like to have @Muqtxdir approval before.

@Jupi007 Jupi007 requested review from Muqtxdir and removed request for Muqtxdir June 11, 2023 19:11
Copy link
Member

@Muqtxdir Muqtxdir left a comment

Choose a reason for hiding this comment

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

thanks

@Jupi007 Jupi007 merged commit 2ac8839 into ubuntu:master Jun 16, 2023
@Jupi007
Copy link
Member

Jupi007 commented Jun 16, 2023

Thanks a lot for this PR @hsbasu 👍
And sorry for the delay.

@hsbasu
Copy link
Contributor Author

hsbasu commented Jun 16, 2023

@Jupi007 It's ok. Glad to contribute.

@Jupi007
Copy link
Member

Jupi007 commented Jun 16, 2023

@hsbasu it is already merged 🙂

@Feichtmeier
Copy link
Member

grafik
:D

@hsbasu
Copy link
Contributor Author

hsbasu commented Jun 16, 2023

😁 didn't see that it's already merged. Good work everyone.

@hsbasu hsbasu deleted the cinnamon-add-variants branch June 16, 2023 21:01
@Initu-Castilhos
Copy link

It does not complete the installation.

@Jupi007
Copy link
Member

Jupi007 commented Jun 17, 2023

@Initu-Castilhos I did a fix PR here: #3921
Can you test it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants