summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Skulimovskiy <skulden13@gmail.com>2021-01-28 12:29:46 +0300
committerCarlton Gibson <carlton@noumenal.es>2021-01-28 15:51:05 +0100
commit269a76714616fd7ad166a14113f3354bab8d9b65 (patch)
tree0cc10d70abd677970892c997e3895114a706e745
parent3c004075b1d4fe4aa1ffc3f7d699dd9525bc6c02 (diff)
Fixed #32391 -- Used CSS flex properties for changelist filter.
Matched layout adjustment using flex from admin sidebar added in d24ba1be7a53a113d19e2860c03aff9922efec24. Filters would become squashed when viewport was constrained or list display table became too wide.
-rw-r--r--django/contrib/admin/static/admin/css/changelists.css2
-rw-r--r--django/contrib/admin/static/admin/css/responsive.css2
-rw-r--r--docs/releases/3.1.6.txt3
3 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css
index f9adf0c085..b4a1557887 100644
--- a/django/contrib/admin/static/admin/css/changelists.css
+++ b/django/contrib/admin/static/admin/css/changelists.css
@@ -128,8 +128,8 @@
/* FILTER COLUMN */
#changelist-filter {
+ flex: 0 0 240px;
order: 1;
- width: 240px;
background: var(--darkened-bg);
border-left: none;
margin: 0 0 0 30px;
diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
index e60a6f02c7..8c6dd810ca 100644
--- a/django/contrib/admin/static/admin/css/responsive.css
+++ b/django/contrib/admin/static/admin/css/responsive.css
@@ -157,7 +157,7 @@ input[type="submit"], button {
}
#changelist-filter {
- width: 200px;
+ flex-basis: 200px;
}
.change-list .filtered .results,
diff --git a/docs/releases/3.1.6.txt b/docs/releases/3.1.6.txt
index dfc60acc95..2d0a48616d 100644
--- a/docs/releases/3.1.6.txt
+++ b/docs/releases/3.1.6.txt
@@ -9,4 +9,5 @@ Django 3.1.6 fixes several bugs in 3.1.5.
Bugfixes
========
-* ...
+* Fixed an admin layout issue in Django 3.1 where changelist filter controls
+ would become squashed (:ticket:`32391`).