-
-
Notifications
You must be signed in to change notification settings - Fork 555
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
reviewed
Dec 13, 2024
...rm-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.js
Outdated
Show resolved
Hide resolved
manuelleduc
reviewed
Dec 13, 2024
...m-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.css
Outdated
Show resolved
Hide resolved
* Escaped the two translations added.
* Updated CSS comment
manuelleduc
added
the
backport stable-15.10.x
Used for automatic backport to 15.10.x branch.
label
Dec 31, 2024
manuelleduc
reviewed
Dec 31, 2024
...m-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.css
Outdated
Show resolved
Hide resolved
manuelleduc
approved these changes
Dec 31, 2024
There was a problem hiding this 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?
* Updated CSS comment
* Updated CSS comment
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
mflorea
requested changes
Jan 10, 2025
...m-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.css
Outdated
Show resolved
Hide resolved
...rm-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.js
Outdated
Show resolved
Hide resolved
...rm-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/resourcePicker.js
Outdated
Show resolved
Hide resolved
* 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
mflorea
approved these changes
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)
💚 All backports created successfully
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira URL
https://jira.xwiki.org/browse/XWIKI-22495
Changes
Description
Clarifications
.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:
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