From 7a9b55ddc4d49775a696d1d34629ebbad2499fa3 Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Tue, 2 Sep 2008 19:25:27 +0000
Subject: Fixed #2612: fixed display of admin `help_text` with multiple fields
 on the same line. Thanks to Nathan Borror for the original patch, and jezdez
 for a little cleanup.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/media/css/forms.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'django/contrib/admin/media/css/forms.css')

diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 234a21ba79..21aadc9465 100644
--- a/django/contrib/admin/media/css/forms.css
+++ b/django/contrib/admin/media/css/forms.css
@@ -9,7 +9,6 @@ form .form-row p { padding-left:0; font-size:11px; }
 /* FORM LABELS */
 form h4 { margin:0 !important; padding:0 !important; border:none !important; }
 label { font-weight:normal !important; color:#666; font-size:12px; }
-label.inline { margin-left:20px; }
 .required label, label.required { font-weight:bold !important; color:#333 !important; }
 
 /* RADIO BUTTONS */
@@ -19,8 +18,7 @@ form ul.inline { margin-left:0; padding:0; }
 form ul.inline li { float:left; padding-right:7px; }
 
 /* ALIGNED FIELDSETS */
-.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
-.aligned label.inline { display:inline; float:none; }
+.aligned label { display:block; padding:3px 10px 0 0; float:left; width:8em; }
 .colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }
 form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
 form .aligned table p { margin-left:0; padding-left:0; }
@@ -28,6 +26,7 @@ form .aligned p.help { padding-left:38px; }
 .aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }
 .colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { width:610px; }
 .checkbox-row p.help { margin-left:0; padding-left:0 !important; }
+fieldset .field-box { float:left; margin-right: 20px; }
 
 /* WIDE FIELDSETS */
 .wide label { width:15em !important; }
@@ -60,10 +59,11 @@ fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Cou
 .module table .vPositiveSmallIntegerField { width:2.2em; }
 .vTextField { width:20em; }
 .vIntegerField { width:5em; }
+.vForeignKeyRawIdAdminField { width: 5em; }
 
-/* x unsorted */
+/* INLINES */
 .inline-group {padding:0; border:1px solid #ccc; margin:10px 0;}
-.inline-group .aligned label { width: 7em; }
+.inline-group .aligned label { width: 8em; }
 
 .inline-related {position:relative;}
 .inline-related h3 {margin: 0; color:#666; padding:3px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-bottom:1px solid #ddd;}
-- 
cgit v1.3