Skip to content

[pull] main from django:main #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Feb 27, 2026
Merged

[pull] main from django:main #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
187a789
Fixed #34643 -- Moved inputs beneath labels and errors in admin forms.
Antoliny0919 Aug 7, 2025
a040f55
Fixed #27489 -- Renamed permissions upon model renaming in migrations.
artirix1927 Apr 20, 2025
97cab5f
Refs #23919 -- Used yield from in Paginator.
Pierre-Sassoulas Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions django/contrib/admin/static/admin/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,6 @@ input, textarea, select, .form-row p, form .button {
font-weight: normal;
font-size: 0.8125rem;
}
.form-row div.help {
padding: 2px 3px;
}

textarea {
vertical-align: top;
Expand Down Expand Up @@ -700,7 +697,7 @@ ul.messagelist li.error {
}

ul.errorlist {
margin: 0 0 4px;
margin: 0;
padding: 0;
color: var(--error-fg);
background: var(--body-bg);
Expand All @@ -709,7 +706,6 @@ ul.errorlist {
ul.errorlist li {
font-size: 0.8125rem;
display: block;
margin-bottom: 4px;
overflow-wrap: break-word;
}

Expand All @@ -731,17 +727,6 @@ td ul.errorlist li {
margin: 0;
}

.form-row.errors {
margin: 0;
border: none;
border-bottom: 1px solid var(--hairline-color);
background: none;
}

.form-row.errors ul.errorlist li {
padding-left: 0;
}

.errors input, .errors select, .errors textarea,
td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea {
border: 1px solid var(--error-fg);
Expand Down
93 changes: 18 additions & 75 deletions django/contrib/admin/static/admin/css/forms.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ form .form-row p {

.flex-container {
display: flex;
gap: 10px;
flex-direction: column;
align-items: flex-start;
}

.form-multiline {
flex-wrap: wrap;
.flex-container div.checkbox {
display: flex;
}

.form-multiline > div,
.form-multiline > fieldset {
padding-bottom: 10px;
.form-multiline {
flex-wrap: wrap;
flex-direction: row;
}

/* FORM LABELS */
Expand All @@ -41,6 +44,7 @@ legend, label {
font-weight: normal;
color: var(--body-quiet-color);
font-size: 0.8125rem;
padding: 0;
}

.required legend, legend.required,
Expand All @@ -59,7 +63,8 @@ form div.radiolist.inline div {
}

form div.radiolist label {
width: auto;
display: inline-block;
padding: 4px 10px 0 0;
}

form div.radiolist input[type="radio"] {
Expand Down Expand Up @@ -94,7 +99,6 @@ fieldset .inline-heading,
/* ALIGNED FIELDSETS */

.aligned fieldset {
flex-grow: 1;
border-top: none;
}

Expand All @@ -104,21 +108,7 @@ fieldset .inline-heading,

.aligned legend {
float: inline-start;
}

.aligned legend,
.aligned label {
display: block;
padding: 4px 10px 0 0;
min-width: 160px;
width: 160px;
word-wrap: break-word;
}

.aligned label:not(.vCheckboxLabel):after {
content: '';
display: inline-block;
vertical-align: middle;
padding: 0.5rem 0;
}

.aligned label + p, .aligned .checkbox-row + div.help, .aligned label + div.readonly {
Expand All @@ -143,30 +133,14 @@ fieldset .inline-heading,
width: 350px;
}

form .aligned ul {
margin-left: 160px;
padding-left: 10px;
}

form .aligned div.radiolist {
display: block;
margin: 0;
padding: 0;
}

form .aligned p.help,
form .aligned div.help {
margin-top: 0;
margin-left: 160px;
padding-left: 10px;
}

form .aligned p.date div.help.timezonewarning,
form .aligned p.datetime div.help.timezonewarning,
form .aligned p.time div.help.timezonewarning {
form .aligned fieldset div.help {
margin-left: 0;
padding-left: 0;
font-weight: normal;
}

form .aligned p.help:last-child,
Expand All @@ -175,16 +149,6 @@ form .aligned div.help:last-child {
padding-bottom: 0;
}

form .aligned input + p.help,
form .aligned textarea + p.help,
form .aligned select + p.help,
form .aligned input + div.help,
form .aligned textarea + div.help,
form .aligned select + div.help {
margin-left: 160px;
padding-left: 10px;
}

form .aligned select option:checked {
background-color: var(--selected-row);
color: var(--body-fg);
Expand All @@ -194,6 +158,11 @@ form .aligned ul li {
list-style: none;
}

form .aligned div.help ul {
padding-left: 0;
margin-left: 0;
}

form .aligned table p {
margin-left: 0;
padding-left: 0;
Expand All @@ -212,32 +181,6 @@ form .aligned table p {
width: 610px;
}

fieldset .fieldBox {
margin-right: 20px;
}

/* WIDE FIELDSETS */

.wide label,
.wide legend {
width: 200px;
}

form .wide p.help,
form .wide ul.errorlist,
form .wide div.help {
padding-left: 50px;
}

form div.help ul {
padding-left: 0;
margin-left: 0;
}

.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField {
width: 450px;
}

/* COLLAPSIBLE FIELDSETS */

.collapse summary .fieldset-heading,
Expand Down
64 changes: 2 additions & 62 deletions django/contrib/admin/static/admin/css/responsive.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@ input[type="submit"], button {
min-height: 0;
}

fieldset .fieldBox + .fieldBox {
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid var(--hairline-color);
}

textarea {
max-width: 100%;
max-height: 120px;
Expand All @@ -224,7 +218,7 @@ input[type="submit"], button {
.aligned .datetimeshortcuts,
.aligned .related-lookup + strong {
align-self: center;
margin-left: 15px;
margin-left: 0.5rem;
}

form .aligned div.radiolist {
Expand Down Expand Up @@ -465,11 +459,7 @@ input[type="submit"], button {
}

.flex-container {
flex-flow: column;
}

.flex-container.checkbox-row {
flex-flow: row;
align-items: stretch;
}

textarea {
Expand All @@ -480,22 +470,6 @@ input[type="submit"], button {
width: auto;
}

fieldset .fieldBox + .fieldBox {
margin-top: 15px;
padding-top: 15px;
}

.aligned legend,
.aligned label {
width: 100%;
min-width: auto;
padding: 0 0 10px;
}

.aligned label:after {
max-height: 0;
}

.aligned .form-row input,
.aligned .form-row select,
.aligned .form-row textarea {
Expand All @@ -513,13 +487,6 @@ input[type="submit"], button {
padding: 1px 0 0 5px;
}

.aligned label + p,
.aligned label + div.help,
.aligned label + div.readonly {
padding: 0;
margin-left: 0;
}

.aligned p.file-upload {
font-size: 0.8125rem;
}
Expand All @@ -533,37 +500,10 @@ input[type="submit"], button {
padding-bottom: 0;
}

.aligned .timezonewarning {
flex: 1 0 100%;
margin-top: 5px;
}

form .aligned .form-row div.help {
width: 100%;
margin: 5px 0 0;
padding: 0;
}

form .aligned ul,
form .aligned ul.errorlist {
margin-left: 0;
padding-left: 0;
}

form .aligned div.radiolist {
margin-top: 5px;
margin-right: 15px;
margin-bottom: -3px;
}

form .aligned div.radiolist:not(.inline) div + div {
margin-top: 5px;
}

form .aligned fieldset div.flex-container {
display: unset;
}

/* Related widget */

.related-widget-wrapper {
Expand Down
11 changes: 0 additions & 11 deletions django/contrib/admin/static/admin/css/responsive_rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,6 @@
/* MOBILE */

@media (max-width: 767px) {
[dir="rtl"] .aligned .related-lookup,
[dir="rtl"] .aligned .datetimeshortcuts {
margin-left: 0;
margin-right: 15px;
}

[dir="rtl"] .aligned ul,
[dir="rtl"] form .aligned ul.errorlist {
margin-right: 0;
}

[dir="rtl"] #changelist-filter {
margin-left: 0;
margin-right: 0;
Expand Down
Loading