Branch: refs/heads/backport/stable-18.8.x/pr-6437 Home: https://github.com/xwiki/xwiki-platform Commit: 2929b30984a051efb8d134144c5e88c132a4ed4b https://github.com/xwiki/xwiki-platform/commit/2929b30984a051efb8d134144c5e8... Author: LucasC <[email protected]> Date: 2026-09-25 (Fri, 25 Sep 2026) Changed paths: M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Macros.xml M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Script.xml M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Style.xml M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/test/java/org/xwiki/annotation/AnnotationCodeMacrosPageTest.java M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/variablelist.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/viewers/comments.css Log Message: ----------- XWIKI-25006: Several regressions in the annotation display after the Comments UI rework (#6437) * Restored the Annotations tab author line, reusing the avatar gutter of the Comments tab * Retargeted the annotation body list and blockquote rules onto .annotation-bubble-content * Removed the dead .annotationAvatar, .annotationHeader, .annotationTools and .annotationComment rules * Replaced the tiled note images of the UPDATED and ALTERED states with an icon and an accent bar * Fixed the ALTERED rule never applying, it was missing the dot before annotationText * Folded the original selection of an UPDATED annotation into a disclosure * Styled the original selection so it no longer looks like the live one * Scoped the state rules on .annotation so the in-page bubble shows them too * Removed the four notesmall images from the style page * Rendered the annotation toolbox in every mode but create, it was limited to the bubble * Restored the Validate button for annotations stored as comments * Hid the Edit button inside the annotation edit form * Bound the tab delete listener to the comment delete button * Moved the toolbox button styling out of the bubble-only scope * Switched the fallback annotation date format to a 24-hour clock * Added page tests for the toolbox of each mode and for the date format * Stopped rendering the delete action inside the annotation edit form * Matched the delete listener on the action own form instead of any enclosing one * Requested a 50px avatar for the Annotations tab, a cap cannot enlarge the 30px one * Capitalised the sentence opening the original selection comment * Added page tests for the avatar size and the delete action of each mode * Grouped the annotation markup assertions into one page test per display mode * Folded the avatar and the date assertions into the per-mode tests that already rendered them * Shortened the comments of the toolbox macro, of the delete listeners and of the annotations list * Sized the annotation avatars from the generic avatar classes instead of per-place rules * Displayed the updated and altered states with the inlineWarning and inlineError macros * Removed the annotation-state rules the custom state markup needed * Removed the comment introducing the annotation toolbox button rules * Explained the gutter and avatar values the Annotations tab takes from a comment * Coloured the original selection with the existing text-muted variable * Dropped the annotation variable added to the skin CSS variables * Added the padding-base-horizontal CSS variable to the skin variable list * Removed the local padding-base-horizontal declaration from the annotation styles * Documented the toolbox actions available in each mode * Hid the delete button of other annotation classes in the edit form * Escaped the delete button URL and tooltip * Added a page test for the toolbox of other annotation classes * Stopped rendering the annotation toolbox in the edit and create forms (cherry picked from commit 86c9c437aff799d2f23c16acd7a74892f0f5059d) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications