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-21600: Various close button modals do not use icons #2821

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

Sereza7
Copy link
Contributor

@Sereza7 Sereza7 commented Jan 25, 2024

Jira URL

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

Changes

Description

  • Replaced hard coded characters in locationPicker and export modals by iconTheme icons.

Screenshots & Video

Before PR vvv
21600-beforePRlocationPicker
21600-beforePRexport
After PR - Font Awesome vvv
21600-afterPRlocationPickerFA
21600-afterPRexportFA
After PR - Silk vvv
21600-afterPRlocationPickerSilk
21600-afterPRexportSilk

Executed Tests

Only manual testing, see the screenshots above.
This only changes the content of a couple elements. I doubt this would fail any test.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • EDIT: after discussing on the chat, it seems like it's better to backport small bugfixes like this one to 15.10.X

* Updated close buttons on two modals
* Updated close buttons on the export modal
* Removed incorrect escaping from the location picker modal
@Sereza7 Sereza7 added the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label Jan 25, 2024
@surli surli merged commit 7758661 into xwiki:master Feb 6, 2024
1 check passed
github-actions bot pushed a commit that referenced this pull request Feb 6, 2024
* Updated close buttons on the export modal
* Removed incorrect escaping from the location picker modal

(cherry picked from commit 7758661)
surli pushed a commit that referenced this pull request Feb 6, 2024
* Updated close buttons on the export modal
* Removed incorrect escaping from the location picker modal

(cherry picked from commit 7758661)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport stable-15.10.x Used for automatic backport to 15.10.x branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants