summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-05-18 07:53:41 -0400
committerTim Graham <timograham@gmail.com>2015-05-19 21:27:57 -0400
commitaeafdf9398edb8a9fe34e10af10f98ae567a97db (patch)
treebafde6d5c788e6280494bcd6dd018dce86cdcfa3
parentb261ab2e43ac9cdced80e4250a2eff97aa7f7d3f (diff)
[1.8.x] Fixed #24784 -- Fixed visibility regression in admin's FK widget.
Backport of fb94e7b8cf8f68629b51a4d4f2c37400ef1c7469 from master
-rw-r--r--django/contrib/admin/static/admin/css/forms.css1
-rw-r--r--django/contrib/admin/static/admin/css/widgets.css1
-rw-r--r--docs/releases/1.8.2.txt3
3 files changed, 5 insertions, 0 deletions
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 199ab3475e..b06bbba194 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -93,6 +93,7 @@ form .aligned table p {
}
form .aligned p.help {
+ clear: left;
padding-left: 38px;
}
diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css
index 0ca42e6088..3defc70d7d 100644
--- a/django/contrib/admin/static/admin/css/widgets.css
+++ b/django/contrib/admin/static/admin/css/widgets.css
@@ -579,6 +579,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
/* RELATED WIDGET WRAPPER */
.related-widget-wrapper {
+ float: left; /* display properly in form rows with multiple fields */
overflow: hidden; /* clear floated contents */
}
diff --git a/docs/releases/1.8.2.txt b/docs/releases/1.8.2.txt
index 896f4d0334..18c1ba38c9 100644
--- a/docs/releases/1.8.2.txt
+++ b/docs/releases/1.8.2.txt
@@ -37,3 +37,6 @@ Bugfixes
* On PostgreSQL, when no access is granted for the ``postgres`` database,
Django now falls back to the default database when it normally requires a
"no database" connection (:ticket:`24791`).
+
+* Fixed display of ``contrib.admin``’s ``ForeignKey`` widget when it's used
+ in a row with other fields (:ticket:`24784`).