Author: wilson
Date: 2008-10-31 18:01:38 -0500 (Fri, 31 Oct 2008)
New Revision: 9300
Added:
django/trunk/django/contrib/admin/media/css/ie6.css
Removed:
django/trunk/django/contrib/admin/media/css/null.css
django/trunk/django/contrib/admin/media/css/patch-iewin.css
Modified:
django/trunk/django/contrib/admin/media/css/base.css
django/trunk/django/contrib/admin/templates/admin/base.html
Log:
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.
Modified: django/trunk/django/contrib/admin/media/css/base.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/base.css 2008-10-31
22:19:21 UTC (rev 9299)
+++ django/trunk/django/contrib/admin/media/css/base.css 2008-10-31
23:01:38 UTC (rev 9300)
@@ -1,14 +1,7 @@
/*
DJANGO Admin
- by Wilson Miner [EMAIL PROTECTED]
*/
-/* Block IE 5 */
[EMAIL PROTECTED] "null.css?\"\{";
-
/* Import other styles */
@import url('global.css');
[EMAIL PROTECTED] url('layout.css');
-
-/* Import patch for IE 6 Windows */
-/*\*/ @import "patch-iewin.css"; /**/
[EMAIL PROTECTED] url('layout.css');
\ No newline at end of file
Added: django/trunk/django/contrib/admin/media/css/ie6.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/ie6.css
(rev 0)
+++ django/trunk/django/contrib/admin/media/css/ie6.css 2008-10-31 23:01:38 UTC
(rev 9300)
@@ -0,0 +1,47 @@
+/* Keep header from flowing off the page */
+
+#container {
+ position: static;
+}
+
+/* Put the right sidebars back on the page */
+
+.colMS #content-related {
+ margin-right: 0;
+ margin-left: 10px;
+ position: static;
+}
+
+/* Put the left sidebars back on the page */
+
+.colSM #content-related {
+ margin-right: 10px;
+ margin-left: -115px;
+ position: static;
+}
+
+.form-row {
+ height: 1%;
+}
+
+/* Proper fixed width for dashboard in IE6 */
+
+.dashboard #content {
+ width: 768px;
+}
+
+.dashboard #content-main {
+ width: 535px;
+}
+
+/* Fix right margin for changelist filters in IE6 */
+
+#changelist-filter ul {
+ margin-right: -10px;
+}
+
+/* IE ignores min-height, but treats height as if it were min-height */
+
+.change-list .filtered {
+ height: 400px;
+}
\ No newline at end of file
Deleted: django/trunk/django/contrib/admin/media/css/null.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/null.css 2008-10-31
22:19:21 UTC (rev 9299)
+++ django/trunk/django/contrib/admin/media/css/null.css 2008-10-31
23:01:38 UTC (rev 9300)
@@ -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
Deleted: django/trunk/django/contrib/admin/media/css/patch-iewin.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/patch-iewin.css 2008-10-31
22:19:21 UTC (rev 9299)
+++ django/trunk/django/contrib/admin/media/css/patch-iewin.css 2008-10-31
23:01:38 UTC (rev 9300)
@@ -1,47 +0,0 @@
-/* Keep header from flowing off the page */
-
-* html #container {
- position: static;
-}
-
-/* Put the right sidebars back on the page */
-
-* html .colMS #content-related {
- margin-right: 0;
- margin-left: 10px;
- position: static;
-}
-
-/* Put the left sidebars back on the page */
-
-* html .colSM #content-related {
- margin-right: 10px;
- margin-left: -115px;
- position: static;
-}
-
-* html .form-row {
- height: 1%;
-}
-
-/* Proper fixed width for dashboard in IE6 */
-
-* html .dashboard #content {
- width: 768px;
-}
-
-* html .dashboard #content-main {
- width: 535px;
-}
-
-/* Fix right margin for changelist filters in IE6 */
-
-* html #changelist-filter ul {
- margin-right: -10px;
-}
-
-/* IE ignores min-height, but treats height as if it were min-height */
-
-* html .change-list .filtered {
- height: 400px;
-}
\ No newline at end of file
Modified: django/trunk/django/contrib/admin/templates/admin/base.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/base.html 2008-10-31
22:19:21 UTC (rev 9299)
+++ django/trunk/django/contrib/admin/templates/admin/base.html 2008-10-31
23:01:38 UTC (rev 9300)
@@ -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 %}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
