diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 475ca24597..1e0f7bc3bd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -11,6 +11,7 @@ Changelog * Fix: Enable `richtext` template tag to convert lazy translation values (Benjamin Bach) * Fix: Ensure permission labels on group permissions page are translated where available (Matt Westcott) * Fix: Preserve whitespace in comment replies (Elhussein Almasri) + * Fix: Address layout issues in the title cell of universal listings (Sage Abdullah) * Docs: Remove duplicate section on frontend caching proxies from performance page (Jake Howard) * Docs: Document `restriction_type` field on PageViewRestriction (Shlomo Markowitz) * Docs: Document Wagtail's bug bounty policy (Jake Howard) @@ -24,6 +25,7 @@ Changelog * Fix: Fix form action URL in user edit and delete views for custom user models (Sage Abdullah) * Fix: Fix snippet copy view not prefilling form data (Sage Abdullah) + * Fix: Address layout issues in the title cell of universal listings (Sage Abdullah) 6.1 (01.05.2024) diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss index a0733d3f34..1dccc9f04a 100644 --- a/client/scss/components/_listing.scss +++ b/client/scss/components/_listing.scss @@ -223,19 +223,13 @@ ul.listing { .title { word-break: break-word; - display: flex; - align-items: center; - justify-content: space-between; - gap: theme('spacing.2'); .title-wrapper, h2 { @apply w-label-1; - display: inline-flex; - gap: theme('spacing.2'); + display: inline; margin: 0; vertical-align: middle; - align-items: center; a { color: inherit; @@ -247,6 +241,11 @@ ul.listing { } } } + + .icon-folder { + margin: 3px 0.3em 0 0; + vertical-align: top; + } } .actions { diff --git a/docs/releases/6.1.1.md b/docs/releases/6.1.1.md index a15d126dd2..4aa05777cd 100644 --- a/docs/releases/6.1.1.md +++ b/docs/releases/6.1.1.md @@ -15,3 +15,4 @@ depth: 1 * Fix form action URL in user edit and delete views for custom user models (Sage Abdullah) * Fix snippet copy view not prefilling form data (Sage Abdullah) + * Address layout issues in the title cell of universal listings (Sage Abdullah) diff --git a/docs/releases/6.2.md b/docs/releases/6.2.md index 4547f6b059..78c3394a79 100644 --- a/docs/releases/6.2.md +++ b/docs/releases/6.2.md @@ -24,6 +24,7 @@ depth: 1 * Enable `richtext` template tag to convert lazy translation values (Benjamin Bach) * Ensure permission labels on group permissions page are translated where available (Matt Westcott) * Preserve whitespace in comment replies (Elhussein Almasri) + * Address layout issues in the title cell of universal listings (Sage Abdullah) ### Documentation diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html index 5173c638ec..755abd8539 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html +++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html @@ -5,7 +5,7 @@
{% if page.is_site_root %} {% if perms.wagtailcore.add_site or perms.wagtailcore.change_site or perms.wagtailcore.delete_site %} - {% icon name="site" classname="initial" %} + {% icon name="site" classname="initial" %} {% endif %} {% endif %} @@ -17,7 +17,7 @@ without also reading out the buttons and indicators. {% endcomment %} {% fragment as page_title %} - + {% if not page.is_site_root and not page.is_leaf %}{% icon name="folder" classname="initial" %}{% endif %} {{ page.get_admin_display_title }} diff --git a/wagtail/users/templates/wagtailusers/users/user_cell.html b/wagtail/users/templates/wagtailusers/users/user_cell.html index 37b08cca23..508529ea48 100644 --- a/wagtail/users/templates/wagtailusers/users/user_cell.html +++ b/wagtail/users/templates/wagtailusers/users/user_cell.html @@ -2,7 +2,7 @@ {% load wagtailadmin_tags %} {% block title %} -
+
{% avatar user=instance size="small" classname="w-shrink-0" %} {{ block.super }}