diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-07-08 12:57:04 +0200 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-07-08 12:57:04 +0200 |
| commit | effc2cad95dbf96ee6fd0ac3fd2da18948135d49 (patch) | |
| tree | 466ab44277bc612864dc3f74f7245f5c7ad6ec5e /django | |
| parent | 3727f6d09681e4cb23d67e14ecc677a364c991bd (diff) | |
| parent | 5e94ef293cb1cfe4dc43cbd5509653c0e0bf66cf (diff) | |
Merge branch 'master' of github.com:django/django
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/static/admin/css/widgets.css | 3 | ||||
| -rw-r--r-- | django/contrib/auth/forms.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index 2989f2f4fd..0a7012c7b2 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -41,7 +41,8 @@ text-align: left; } -.selector .selector-filter label { +.selector .selector-filter label, +.inline-group .aligned .selector .selector-filter label { width: 16px; padding: 2px; } diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index bce8747661..d2cb039e68 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django import forms from django.forms.util import flatatt from django.template import loader |