Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added IE conditional comments to contrib.admin base template to block…

… CSS from IE5 and lower and serve a patch to IE6 with IE conditional comments. Removed dependency on CSS hacks and empty null.css file.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 50535505a9fe0b247a675b02515c9f12cc3b5e6e 1 parent 3028e85
Wilson Miner authored
View
9 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');
View
16 django/contrib/admin/media/css/patch-iewin.css → 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;
}
View
1  django/contrib/admin/media/css/null.css
@@ -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 */
View
3  django/contrib/admin/templates/admin/base.html
@@ -2,7 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<title>{% block title %}{% endblock %}</title>
-<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />
+<![if gte IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /><![endif]>
+<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie6 %}{% load adminmedia %}{% admin_media_prefix %}css/ie6.css{% endblock %}" /><![endif]-->
{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
{% block extrastyle %}{% endblock %}
{% block extrahead %}{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.