mirror of
https://github.com/django/django.git
synced 2025-06-05 11:39:13 +00:00
Fixed #33728 -- Reordered submit buttons in admin.
Thanks Tom Carrick and Thibaud Colas for reviews.
This commit is contained in:
parent
f0fa2a3b49
commit
b4817d20b9
@ -506,7 +506,6 @@ a.button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.button.default, input[type=submit].default, .submit-row input.default {
|
.button.default, input[type=submit].default, .submit-row input.default {
|
||||||
float: right;
|
|
||||||
border: none;
|
border: none;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
background: var(--default-button-bg);
|
background: var(--default-button-bg);
|
||||||
|
@ -259,7 +259,6 @@ fieldset.monospace textarea {
|
|||||||
background: var(--darkened-bg);
|
background: var(--darkened-bg);
|
||||||
border: 1px solid var(--hairline-color);
|
border: 1px solid var(--hairline-color);
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-align: right;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -270,11 +269,10 @@ body.popup .submit-row {
|
|||||||
.submit-row input {
|
.submit-row input {
|
||||||
height: 35px;
|
height: 35px;
|
||||||
line-height: 15px;
|
line-height: 15px;
|
||||||
margin: 0 0 5px 5px;
|
margin: 0 5px 5px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.submit-row input.default {
|
.submit-row input.default {
|
||||||
margin: 0 0 5px 8px;
|
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -283,7 +281,7 @@ body.popup .submit-row {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.submit-row p.deletelink-box {
|
.submit-row p.deletelink-box {
|
||||||
float: left;
|
float: right;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,10 +239,6 @@ input[type="submit"], button {
|
|||||||
padding: 10px 7px;
|
padding: 10px 7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.submit-row input.default {
|
|
||||||
margin: 0 0 5px 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button, input[type=submit], input[type=button], .submit-row input, a.button {
|
.button, input[type=submit], input[type=button], .submit-row input, a.button {
|
||||||
padding: 7px;
|
padding: 7px;
|
||||||
}
|
}
|
||||||
|
@ -114,16 +114,16 @@ thead th.sorted .text {
|
|||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.submit-row {
|
|
||||||
text-align: left
|
|
||||||
}
|
|
||||||
|
|
||||||
.submit-row p.deletelink-box {
|
.submit-row p.deletelink-box {
|
||||||
float: right;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.submit-row input.default {
|
.submit-row input.default {
|
||||||
margin-left: 0;
|
margin: 0 0 5px 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.submit-row input {
|
||||||
|
margin: 0 0 5px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vDateField, .vTimeField {
|
.vDateField, .vTimeField {
|
||||||
@ -149,8 +149,8 @@ form ul.inline li {
|
|||||||
padding-left: 7px;
|
padding-left: 7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=submit].default, .submit-row input.default {
|
.submit-row {
|
||||||
float: left;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
fieldset .fieldBox {
|
fieldset .fieldBox {
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
<div class="submit-row">
|
<div class="submit-row">
|
||||||
{% block submit-row %}
|
{% block submit-row %}
|
||||||
{% if show_save %}<input type="submit" value="{% translate 'Save' %}" class="default" name="_save">{% endif %}
|
{% 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_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_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_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_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 %}
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user