summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2010-09-10 17:49:42 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2010-09-10 17:49:42 +0000
commit003ed01bb3c8b26fbc16c38d6e7d110cf7fd0d8c (patch)
tree4a13dcbe0856217194bcff46ab8ea0a9d40350b9
parent30ad3537184fb8db8051b91b060c50ad73b53b7e (diff)
Admin changelist page now has consistent width with or without filter
bar. Patch and testing from Kronuz and radez. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/media/css/changelists.css2
-rw-r--r--django/contrib/admin/templates/admin/change_list_results.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css
index 99ff8bc0cf..3f8cf3c21b 100644
--- a/django/contrib/admin/media/css/changelists.css
+++ b/django/contrib/admin/media/css/changelists.css
@@ -21,7 +21,7 @@
background: white url(../img/admin/changelist-bg.gif) top right repeat-y !important;
}
-.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
+.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
margin-right: 160px !important;
width: auto !important;
}
diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index 0efcc9b24a..cd2050e895 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -1,4 +1,5 @@
{% if results %}
+<div class="results">
<table cellspacing="0" id="result_list">
<thead>
<tr>
@@ -14,4 +15,5 @@
{% endfor %}
</tbody>
</table>
+</div>
{% endif %}