From 5d4d62bf4fe887fcd30f9f0449de07ae76ea5968 Mon Sep 17 00:00:00 2001 From: Faheel Ahmad Date: Thu, 5 Apr 2018 20:25:36 +0530 Subject: Fixed #29248 -- Renamed admin CSS class field-box to fieldBox. --- django/contrib/admin/static/admin/css/forms.css | 2 +- django/contrib/admin/static/admin/css/responsive.css | 6 +++--- django/contrib/admin/static/admin/css/rtl.css | 2 +- django/contrib/admin/templates/admin/includes/fieldset.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 77985d5d34..82930a0cd6 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -177,7 +177,7 @@ form .aligned table p { padding-left: 0; } -fieldset .field-box { +fieldset .fieldBox { float: left; margin-right: 20px; } diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css index 7460304843..2a4b2bbd40 100644 --- a/django/contrib/admin/static/admin/css/responsive.css +++ b/django/contrib/admin/static/admin/css/responsive.css @@ -207,13 +207,13 @@ input[type="submit"], button { min-height: 0; } - fieldset .field-box { + fieldset .fieldBox { float: none; margin: 0 -10px; padding: 0 10px; } - fieldset .field-box + .field-box { + fieldset .fieldBox + .fieldBox { margin-top: 10px; padding-top: 10px; border-top: 1px solid #eee; @@ -572,7 +572,7 @@ input[type="submit"], button { width: auto; } - fieldset .field-box + .field-box { + fieldset .fieldBox + .fieldBox { margin-top: 15px; padding-top: 15px; } diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css index ef397815e6..f7514a5d38 100644 --- a/django/contrib/admin/static/admin/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -180,7 +180,7 @@ input[type=submit].default, .submit-row input.default { float: left; } -fieldset .field-box { +fieldset .fieldBox { float: right; margin-left: 20px; margin-right: 0; diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html index fce9966664..218fd5a4c1 100644 --- a/django/contrib/admin/templates/admin/includes/fieldset.html +++ b/django/contrib/admin/templates/admin/includes/fieldset.html @@ -7,7 +7,7 @@
{% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} {% for field in line %} - + {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} {% if field.is_checkbox %} {{ field.field }}{{ field.label_tag }} -- cgit v1.3