From 5927b1225145ffed20a2466c323f66635b291f8e Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Fri, 19 Apr 2024 21:10:23 +0700 Subject: [PATCH] Remove --inline-actions variant of listing tables This was added in f322e9d8680530cc9668708a2ad06c2e8e7d7748, when the snippets listing view was briefly redesigned to put the "Edit", "Delete" etc. actions in the same line as the title instead of in a new line. With the universal listings design, all listing actions are put inside a three-dot dropdown menu. This style is no longer used anywhere in Wagtail, especially now that the HistoryView has been reimplemented using the dropdown menu for the actions. --- client/scss/components/_listing.scss | 34 +++---------------------- client/scss/components/_status-tag.scss | 1 + wagtail/admin/ui/tables/__init__.py | 4 --- wagtail/admin/views/generic/history.py | 3 +-- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss index 7323657ab8..a0733d3f34 100644 --- a/client/scss/components/_listing.scss +++ b/client/scss/components/_listing.scss @@ -223,6 +223,10 @@ ul.listing { .title { word-break: break-word; + display: flex; + align-items: center; + justify-content: space-between; + gap: theme('spacing.2'); .title-wrapper, h2 { @@ -261,36 +265,6 @@ ul.listing { } } - &--inline-actions td.title { - display: flex; - align-items: center; - justify-content: space-between; - flex-wrap: wrap; - gap: 0.5rem; - - .title-wrapper { - margin-inline-end: 2.5em; - } - - .w-status { - margin: 0; - } - } - - &--inline-actions .actions { - display: inline-block; - margin-top: 0; - vertical-align: inherit; - - li { - margin-bottom: 0; - } - - .button { - vertical-align: inherit; - } - } - .moderate-actions form { float: inline-start; margin: 0 1em 1em 0; diff --git a/client/scss/components/_status-tag.scss b/client/scss/components/_status-tag.scss index 456b8cbc9d..8d165683b8 100644 --- a/client/scss/components/_status-tag.scss +++ b/client/scss/components/_status-tag.scss @@ -4,6 +4,7 @@ border-radius: 2px; text-align: center; display: inline-block; + word-break: normal; // stylelint-disable-next-line property-disallowed-list text-transform: uppercase; padding: 0 0.5em; diff --git a/wagtail/admin/ui/tables/__init__.py b/wagtail/admin/ui/tables/__init__.py index 474f9d7c1b..23b68ae25f 100644 --- a/wagtail/admin/ui/tables/__init__.py +++ b/wagtail/admin/ui/tables/__init__.py @@ -518,7 +518,3 @@ class Table(Component): @cached_property def attrs(self): return self.table.get_row_attrs(self.instance) - - -class InlineActionsTable(Table): - classname = "listing listing--inline-actions" diff --git a/wagtail/admin/views/generic/history.py b/wagtail/admin/views/generic/history.py index c2d105f464..5227b7d08b 100644 --- a/wagtail/admin/views/generic/history.py +++ b/wagtail/admin/views/generic/history.py @@ -16,7 +16,7 @@ from wagtail.admin.filters import ( MultipleUserFilter, WagtailFilterSet, ) -from wagtail.admin.ui.tables import Column, DateColumn, InlineActionsTable, UserColumn +from wagtail.admin.ui.tables import Column, DateColumn, UserColumn from wagtail.admin.utils import get_latest_str from wagtail.admin.views.generic.base import ( BaseListingView, @@ -197,7 +197,6 @@ class HistoryView(PermissionCheckedMixin, BaseObjectMixin, BaseListingView): is_searchable = False paginate_by = 20 filterset_class = HistoryFilterSet - table_class = InlineActionsTable history_url_name = None history_results_url_name = None edit_url_name = None