Fixed #33728 -- Reordered submit buttons in admin.

Thanks Tom Carrick and Thibaud Colas for reviews.

5 files changed, 14 insertions, 21 deletions

diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css
index 1ff93e245f..581355d3f7 100644
--- a/django/contrib/admin/static/admin/css/base.css
+++ b/django/contrib/admin/static/admin/css/base.css
@@ -506,7 +506,6 @@ a.button {
 }
 
 .button.default, input[type=submit].default, .submit-row input.default {
-    float: right;
     border: none;
     font-weight: 400;
     background: var(--default-button-bg);
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 622323938a..9f90adddaa 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -259,7 +259,6 @@ fieldset.monospace textarea {
     background: var(--darkened-bg);
     border: 1px solid var(--hairline-color);
     border-radius: 4px;
-    text-align: right;
     overflow: hidden;
 }
 
@@ -270,11 +269,10 @@ body.popup .submit-row {
 .submit-row input {
     height: 35px;
     line-height: 15px;
-    margin: 0 0 5px 5px;
+    margin: 0 5px 5px 0;
 }
 
 .submit-row input.default {
-    margin: 0 0 5px 8px;
     text-transform: uppercase;
 }
 
@@ -283,7 +281,7 @@ body.popup .submit-row {
 }
 
 .submit-row p.deletelink-box {
-    float: left;
+    float: right;
     margin: 0;
 }
 
diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
index 9a4615d09e..46c0f28961 100644
--- a/django/contrib/admin/static/admin/css/responsive.css
+++ b/django/contrib/admin/static/admin/css/responsive.css
@@ -239,10 +239,6 @@ input[type="submit"], button {
         padding: 10px 7px;
     }
 
-    .submit-row input.default {
-        margin: 0 0 5px 5px;
-    }
-
     .button, input[type=submit], input[type=button], .submit-row input, a.button {
         padding: 7px;
     }
diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css
index e0fadcefb0..7ccbd282a5 100644
--- a/django/contrib/admin/static/admin/css/rtl.css
+++ b/django/contrib/admin/static/admin/css/rtl.css
@@ -114,16 +114,16 @@ thead th.sorted .text {
     float: right;
 }
 
-.submit-row {
-    text-align: left
-}
-
 .submit-row p.deletelink-box {
-    float: right;
+    float: left;
 }
 
 .submit-row input.default {
-    margin-left: 0;
+    margin: 0 0 5px 5px;
+}
+
+.submit-row input {
+    margin: 0 0 5px 5px;
 }
 
 .vDateField, .vTimeField {
@@ -149,8 +149,8 @@ form ul.inline li {
     padding-left: 7px;
 }
 
-input[type=submit].default, .submit-row input.default {
-    float: left;
+.submit-row {
+    text-align: right;
 }
 
 fieldset .fieldBox {
diff --git a/django/contrib/admin/templates/admin/submit_line.html b/django/contrib/admin/templates/admin/submit_line.html
index f401f0d8aa..3582f054be 100644
--- a/django/contrib/admin/templates/admin/submit_line.html
+++ b/django/contrib/admin/templates/admin/submit_line.html
@@ -2,13 +2,13 @@
 <div class="submit-row">
 {% block submit-row %}
 {% if show_save %}<input type="submit" value="{% translate 'Save' %}" class="default" name="_save">{% endif %}
-{% if show_delete_link and original %}
-    {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
-    <p class="deletelink-box"><a href="{% add_preserved_filters delete_url %}" class="deletelink">{% translate "Delete" %}</a></p>
-{% endif %}
 {% if show_save_as_new %}<input type="submit" value="{% translate 'Save as new' %}" name="_saveasnew">{% endif %}
 {% if show_save_and_add_another %}<input type="submit" value="{% translate 'Save and add another' %}" name="_addanother">{% endif %}
 {% if show_save_and_continue %}<input type="submit" value="{% if can_change %}{% translate 'Save and continue editing' %}{% else %}{% translate 'Save and view' %}{% endif %}" name="_continue">{% endif %}
 {% if show_close %}<a href="{% url opts|admin_urlname:'changelist' %}" class="closelink">{% translate 'Close' %}</a>{% endif %}
+{% if show_delete_link and original %}
+    {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
+    <p class="deletelink-box"><a href="{% add_preserved_filters delete_url %}" class="deletelink">{% translate "Delete" %}</a></p>
+{% endif %}
 {% endblock %}
 </div>