From dfa31f8e87b11c819d6564f925743c0978ea3351 Mon Sep 17 00:00:00 2001
From: 007gzs <007gzs@gmail.com>
Date: Wed, 19 Aug 2020 08:40:32 +0800
Subject: [PATCH] [3.1.x] Fixed #31901 -- Prevented content overflowing in the
 admin changelist with navigation sidebar.

Backport of 2bc38bc7cae002f949157d95e3f0c19ea6b8ca5c from master
---
 django/contrib/admin/static/admin/css/changelists.css | 1 +
 django/contrib/admin/static/admin/css/nav_sidebar.css | 4 ++++
 docs/releases/3.1.1.txt                               | 3 +++
 3 files changed, 8 insertions(+)

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`).