diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css index 9760d67dc4..615c06ffc6 100644 --- a/django/contrib/admin/media/css/base.css +++ b/django/contrib/admin/media/css/base.css @@ -1,14 +1,7 @@ /* DJANGO Admin - by Wilson Miner wilson@lawrence.com */ -/* Block IE 5 */ -@import "null.css?\"\{"; - /* Import other styles */ @import url('global.css'); -@import url('layout.css'); - -/* Import patch for IE 6 Windows */ -/*\*/ @import "patch-iewin.css"; /**/ +@import url('layout.css'); \ No newline at end of file diff --git a/django/contrib/admin/media/css/patch-iewin.css b/django/contrib/admin/media/css/ie6.css similarity index 71% rename from django/contrib/admin/media/css/patch-iewin.css rename to django/contrib/admin/media/css/ie6.css index ab0b9451e0..50df658443 100644 --- a/django/contrib/admin/media/css/patch-iewin.css +++ b/django/contrib/admin/media/css/ie6.css @@ -1,12 +1,12 @@ /* Keep header from flowing off the page */ -* html #container { +#container { position: static; } /* Put the right sidebars back on the page */ -* html .colMS #content-related { +.colMS #content-related { margin-right: 0; margin-left: 10px; position: static; @@ -14,34 +14,34 @@ /* Put the left sidebars back on the page */ -* html .colSM #content-related { +.colSM #content-related { margin-right: 10px; margin-left: -115px; position: static; } -* html .form-row { +.form-row { height: 1%; } /* Proper fixed width for dashboard in IE6 */ -* html .dashboard #content { +.dashboard #content { width: 768px; } -* html .dashboard #content-main { +.dashboard #content-main { width: 535px; } /* Fix right margin for changelist filters in IE6 */ -* html #changelist-filter ul { +#changelist-filter ul { margin-right: -10px; } /* IE ignores min-height, but treats height as if it were min-height */ -* html .change-list .filtered { +.change-list .filtered { height: 400px; } \ No newline at end of file diff --git a/django/contrib/admin/media/css/null.css b/django/contrib/admin/media/css/null.css deleted file mode 100644 index 1a93f22058..0000000000 --- a/django/contrib/admin/media/css/null.css +++ /dev/null @@ -1 +0,0 @@ -/* Nothing to see here. Dummy file to feed to the high pass filter which hides CSS from IE5/win. Details: http://tantek.com/CSS/Examples/highpass.html */ \ No newline at end of file diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index fdf0f28221..a479ba27e6 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -2,7 +2,8 @@ {% block title %}{% endblock %} - + + {% if LANGUAGE_BIDI %}{% endif %} {% block extrastyle %}{% endblock %} {% block extrahead %}{% endblock %}