summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author007gzs <007gzs@gmail.com>2020-08-19 08:40:32 +0800
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-09-01 08:19:12 +0200
commitdfa31f8e87b11c819d6564f925743c0978ea3351 (patch)
tree53afa9425f3ee19c5d2d9dcdb9bf4fecc302728e
parent42f8c085a602fd897b53eaaef0b90e1ede66d8cc (diff)
[3.1.x] Fixed #31901 -- Prevented content overflowing in the admin changelist with navigation sidebar.
Backport of 2bc38bc7cae002f949157d95e3f0c19ea6b8ca5c from master
-rw-r--r--django/contrib/admin/static/admin/css/changelists.css1
-rw-r--r--django/contrib/admin/static/admin/css/nav_sidebar.css4
-rw-r--r--docs/releases/3.1.1.txt3
3 files changed, 8 insertions, 0 deletions
diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css
index abd2640b4a..f9b171c3d0 100644
--- a/django/contrib/admin/static/admin/css/changelists.css
+++ b/django/contrib/admin/static/admin/css/changelists.css
@@ -90,6 +90,7 @@
margin: 0;
vertical-align: top;
font-size: 13px;
+ max-width: 230px;
}
#changelist #toolbar form #searchbar:focus {
diff --git a/django/contrib/admin/static/admin/css/nav_sidebar.css b/django/contrib/admin/static/admin/css/nav_sidebar.css
index 12f0471bb0..be03db966c 100644
--- a/django/contrib/admin/static/admin/css/nav_sidebar.css
+++ b/django/contrib/admin/static/admin/css/nav_sidebar.css
@@ -104,3 +104,7 @@
display: none;
}
}
+
+.change-list .main > #nav-sidebar+.content {
+ overflow: hidden;
+}
diff --git a/docs/releases/3.1.1.txt b/docs/releases/3.1.1.txt
index 932d6b467d..359acfcffc 100644
--- a/docs/releases/3.1.1.txt
+++ b/docs/releases/3.1.1.txt
@@ -62,3 +62,6 @@ Bugfixes
* Fixed a ``django.contrib.admin.EmptyFieldListFilter`` crash when using on
reverse relations (:ticket:`31952`).
+
+* Prevented content overflowing in the admin changelist view when the
+ navigation sidebar is enabled (:ticket:`31901`).