From 3d943c4f55e24eb77a5fc70e6253e182110d80f6 Mon Sep 17 00:00:00 2001 From: Tom Carrick Date: Thu, 23 Nov 2023 11:16:44 +0100 Subject: [PATCH] [4.2.x] Fixed #34991 -- Fixed pagination links and input layout in admin's change list page when using list_editable. Regression in b4817d20b9e55df30be0b1b2ca8c8bb6d61aab07. Thanks Tom Carrick for the report and fix. Backport of 4eb9c3d90aff55182151b6be0122f7d0b28832fd from main --- django/contrib/admin/static/admin/css/base.css | 7 +++++++ django/contrib/admin/static/admin/css/rtl.css | 10 ++++++++++ docs/releases/4.2.8.txt | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 72f4ae169b..93db7d062a 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -1090,6 +1090,9 @@ a.deletelink:focus, a.deletelink:hover { /* PAGINATOR */ .paginator { + display: flex; + align-items: center; + gap: 4px; font-size: 0.8125rem; padding-top: 10px; padding-bottom: 10px; @@ -1133,6 +1136,10 @@ a.deletelink:focus, a.deletelink:hover { background: var(--link-hover-color); } +.paginator input { + margin-left: auto; +} + .base-svgs { display: none; } diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css index 53a6dd6ca9..c349a939ed 100644 --- a/django/contrib/admin/static/admin/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -107,6 +107,16 @@ thead th.sorted .text { border-left: none; } +.paginator .end { + margin-left: 6px; + margin-right: 0; +} + +.paginator input { + margin-left: 0; + margin-right: auto; +} + /* FORMS */ .aligned label { diff --git a/docs/releases/4.2.8.txt b/docs/releases/4.2.8.txt index f155e309c3..be87f01054 100644 --- a/docs/releases/4.2.8.txt +++ b/docs/releases/4.2.8.txt @@ -20,3 +20,7 @@ Bugfixes * Fixed a regression in Django 4.2 that caused a crash when annotating a ``QuerySet`` with a ``Window`` expressions composed of a ``partition_by`` clause mixing field types and aggregation expressions (:ticket:`34987`). + +* Fixed a regression in Django 4.2 where the admin's change list page had + misaligned pagination links and inputs when using ``list_editable`` + (:ticket:`34991`).