diff --git a/client/scss/overrides/_utilities.legacy.scss b/client/scss/overrides/_utilities.legacy.scss index 26c4dcea4b..dcf3980ed6 100644 --- a/client/scss/overrides/_utilities.legacy.scss +++ b/client/scss/overrides/_utilities.legacy.scss @@ -1,8 +1,3 @@ -.u-hidden { - // stylelint-disable-next-line declaration-no-important - display: none !important; -} - .nice-padding { padding-inline-start: $mobile-nice-padding; padding-inline-end: $mobile-nice-padding; diff --git a/client/src/entrypoints/admin/comments.js b/client/src/entrypoints/admin/comments.js index 9b96aa01c9..817f605469 100644 --- a/client/src/entrypoints/admin/comments.js +++ b/client/src/entrypoints/admin/comments.js @@ -105,11 +105,11 @@ window.comments = (() => { } show() { - this.node.classList.remove('u-hidden'); + this.node.classList.remove('!w-hidden'); } hide() { - this.node.classList.add('u-hidden'); + this.node.classList.add('!w-hidden'); } setOnClickHandler(localId) { @@ -231,7 +231,7 @@ window.comments = (() => { 'aria-describedby', this.commentAdditionNode.getAttribute('aria-describedby'), ); - annotationNode.classList.remove('u-hidden'); + annotationNode.classList.remove('!w-hidden'); this.commentAdditionNode.insertAdjacentElement( 'beforebegin', annotationNode, diff --git a/client/src/includes/bulk-actions.js b/client/src/includes/bulk-actions.js index 6867f870a8..2ea9e2c78b 100644 --- a/client/src/includes/bulk-actions.js +++ b/client/src/includes/bulk-actions.js @@ -126,12 +126,12 @@ function onSelectIndividualCheckbox(e) { if (checkedState.shouldShowAllInListingText) { document .querySelector(BULK_ACTION_NUM_OBJECTS_IN_LISTING) - .classList.remove('u-hidden'); + .classList.remove('w-hidden'); } } else if (checkedState.shouldShowAllInListingText) { document .querySelector(BULK_ACTION_NUM_OBJECTS_IN_LISTING) - .classList.add('u-hidden'); + .classList.add('w-hidden'); } if (numCheckedObjects > 0) { @@ -169,7 +169,7 @@ function onClickSelectAllInListing(e) { ).textContent = `${getStringForListing('ALL_IN_LISTING')}.`; document .querySelector(BULK_ACTION_NUM_OBJECTS_IN_LISTING) - .classList.add('u-hidden'); + .classList.add('w-hidden'); } /** diff --git a/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html b/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html index a25a962d01..eab91d9d32 100644 --- a/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html +++ b/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html @@ -6,7 +6,7 @@
{% if objects.has_other_pages %} - + {% endif %} diff --git a/wagtail/admin/templates/wagtailadmin/panels/comments/comment_panel.html b/wagtail/admin/templates/wagtailadmin/panels/comments/comment_panel.html index 2d62016a12..f12a20f403 100644 --- a/wagtail/admin/templates/wagtailadmin/panels/comments/comment_panel.html +++ b/wagtail/admin/templates/wagtailadmin/panels/comments/comment_panel.html @@ -1,5 +1,5 @@ {% load wagtailadmin_tags %} -