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-22495: Missing text content in the resource picker dropdown #3612

Merged
merged 9 commits into from
Jan 28, 2025

Conversation

Sereza7
Copy link
Contributor

@Sereza7 Sereza7 commented Oct 30, 2024

Jira URL

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

Changes

Description

  • Added a translated title/content to the dropdown toggle
  • Updated the style to allow for the use of .sr-only in this specific context (overriding CKEditor CSS reset)

Clarifications

  • The CKEditor CSS reset works on .cke_reset_all *. Pretty much anything more specific than .sr-only is enough to take priority over it. I decided to go with a local definition (only useful for this specific element). If any other sr-only elements are needed in our CKEditor UI, we might want to write a style rule for all of them with .cke_reset_all .sr-only.

Screenshots & Video

No visual changes in between before and after the PR, except for the title tooltip appearing when hovering the button.
Here is what the UI would look like after the changes proposed in this PR:
Screenshot from 2024-10-30 16-43-29

Executed Tests

Manual tests on a local instance, see screenshot above.
As far as I can see, integration-tests should not be impacted by this change.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • 15.10.x
    • 16.4.x

* Added a translated title/content to the dropdown toggle
* Updated the style to allow for the use of .sr-only in this specific context (overriding CKEditor CSS reset)
@manuelleduc manuelleduc added the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label Dec 31, 2024
Copy link
Contributor

@manuelleduc manuelleduc left a comment

Choose a reason for hiding this comment

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

lgtm, maybe a quick check from @mflorea as well?

@manuelleduc manuelleduc requested a review from mflorea December 31, 2024 15:31
@Sereza7 Sereza7 added backport stable-16.10.x and removed backport stable-15.10.x Used for automatic backport to 15.10.x branch. labels Jan 3, 2025
Sereza7 and others added 3 commits January 24, 2025 10:24
* Removed unnecessary `first` selector for dropdown toggle customization

Co-authored-by: Marius Dumitru Florea <[email protected]>
* Fixed indentation
* Moved around the sr-only style and made it more generic
@Sereza7 Sereza7 requested a review from mflorea January 24, 2025 09:43
@mflorea mflorea merged commit 52833dc into xwiki:master Jan 28, 2025
github-actions bot pushed a commit that referenced this pull request Jan 28, 2025
)

* Added a translated title/content to the dropdown toggle
* Updated the style to allow for the use of .sr-only in this specific context (overriding CKEditor CSS reset)

(cherry picked from commit 52833dc)
Copy link

💚 All backports created successfully

Status Branch Result
stable-16.10.x

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

mflorea pushed a commit that referenced this pull request Jan 28, 2025
)

* Added a translated title/content to the dropdown toggle
* Updated the style to allow for the use of .sr-only in this specific context (overriding CKEditor CSS reset)

(cherry picked from commit 52833dc)
mflorea pushed a commit that referenced this pull request Jan 28, 2025
)

* Added a translated title/content to the dropdown toggle
* Updated the style to allow for the use of .sr-only in this specific context (overriding CKEditor CSS reset)

(cherry picked from commit 52833dc)
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.

3 participants