Fixed #36887 -- Improved admin changelist layout for object-tools button.

4 files changed, 18 insertions, 15 deletions

diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css
index ea7707eb89..dc6e24a476 100644
--- a/django/contrib/admin/static/admin/css/base.css
+++ b/django/contrib/admin/static/admin/css/base.css
@@ -808,18 +808,25 @@ a.deletelink:focus, a.deletelink:hover {
     text-decoration: none;
 }
 
+/* TITLES */
+
+.titles-and-tools {
+    display: flex;
+}
+
+.titles {
+    flex-grow: 1;
+}
+
 /* OBJECT TOOLS */
 
 .object-tools {
     padding: 0;
-    overflow: hidden;
-    text-align: right;
-    margin: 0 0 15px;
+    margin: 0;
 }
 
 .object-tools li {
     display: inline-block;
-    height: auto;
 }
 
 .object-tools li + li {
diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
index c8af03ba90..9524cc5263 100644
--- a/django/contrib/admin/static/admin/css/responsive.css
+++ b/django/contrib/admin/static/admin/css/responsive.css
@@ -439,11 +439,15 @@ input[type="submit"], button {
         margin-top: 30px;
     }
 
-    .object-tools {
-        text-align: left;
+    /* Forms */
+
+    .titles-and-tools {
+        flex-direction: column;
     }
 
-    /* Forms */
+    .object-tools {
+        margin-bottom: 10px;
+    }
 
     .form-row {
         padding: 15px 0;
diff --git a/django/contrib/admin/static/admin/css/responsive_rtl.css b/django/contrib/admin/static/admin/css/responsive_rtl.css
index cd32867688..34a3462b6c 100644
--- a/django/contrib/admin/static/admin/css/responsive_rtl.css
+++ b/django/contrib/admin/static/admin/css/responsive_rtl.css
@@ -53,10 +53,6 @@
         margin-right: 0;
     }
 
-    [dir="rtl"] .object-tools {
-        text-align: right;
-    }
-
     [dir="rtl"] .aligned .vCheckboxLabel {
         padding: 1px 5px 0 0;
     }
diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css
index aa7c4e8636..4726aceb9c 100644
--- a/django/contrib/admin/static/admin/css/rtl.css
+++ b/django/contrib/admin/static/admin/css/rtl.css
@@ -25,10 +25,6 @@ th {
     background-position: 100% 1px;
 }
 
-.object-tools {
-    text-align: left;
-}
-
 .object-tools li + li {
     margin-right: 15px;
     margin-left: 0;