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

XWIKI-22316: Some elements keep main theme CSS values #3263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Sereza7
Copy link
Contributor

@Sereza7 Sereza7 commented Jul 11, 2024

Jira URL

https://jira.xwiki.org/browse/XWIKI-22316

Changes

Description

  • Updated the Applications Panel to use the document style
  • Updated the Notification displayer UIX to use the document style
  • Removed style for the Colibri skin in order to use new color theme variables in the application panel.
  • Removed useless calls to colorThemeInit.vm at the start of ssxs (and set the parsing off for those.)

Clarifications

  • We have to convey the colortheme explicitely since it's not in the context we can take in the UIXs

Screenshots & Video

2024-07-11.14-54-25.mp4

We can see here that I used multiple color themes, one for each of: main page, sandbox, application panel document, notification UIX document.
On all of those the elements follow the current colorTheme of the document and not the one from where they are defined.

Executed Tests

Only manual tests, UIX content only, focused on style, I don't think there's any automatic coverage for this.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • 15.10.X

* Updated the Applications Panel to use the document style
* Updated the Notification displayer UIX to use the document style
* Removed style for the Colibri skin in order to use new color theme variables in the application panel.
* Removed useless calls to colorThemeInit.vm at the start of ssxs (and set the parsing off for those.)
@Sereza7 Sereza7 added the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label Jul 11, 2024
-webkit-border-radius: 7px;
border-radius: 7px;
margin: 1px 0;
}
Copy link
Member

Choose a reason for hiding this comment

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

Not sure why you removed those changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was just cleaning up old code related to colibri, which we don't support anymore since 6.4 .
https://extensions.xwiki.org/xwiki/bin/view/Extension/Colibri%20Skin
It was moved to contrib and IMO this code has little use being in the code base. Since this PR needed an update of the SSX, I thought it would be okay to clean it up a bit here directly.
Did I get something wrong?

@surli
Copy link
Member

surli commented Aug 27, 2024

Note: I wouldn't backport this to LTS.

@Sereza7 Sereza7 added backport stable-16.4.x and removed backport stable-15.10.x Used for automatic backport to 15.10.x branch. labels Sep 12, 2024
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.

2 participants