Author: wilson
Date: 2008-10-31 18:44:24 -0500 (Fri, 31 Oct 2008)
New Revision: 9303
Added:
django/trunk/django/contrib/admin/media/css/ie.css
Removed:
django/trunk/django/contrib/admin/media/css/ie6.css
Modified:
django/trunk/django/contrib/admin/templates/admin/base.html
Log:
Applied contrib.admin IE CSS patches to IE6 and 7, and added simple hacks to
filter some rules to both and some only to IE6.
Added: django/trunk/django/contrib/admin/media/css/ie.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/ie.css
(rev 0)
+++ django/trunk/django/contrib/admin/media/css/ie.css 2008-10-31 23:44:24 UTC
(rev 9303)
@@ -0,0 +1,51 @@
+/* IE 6 & 7 */
+
+/* Proper fixed width for dashboard in IE6 */
+
+.dashboard #content {
+ *width: 768px;
+}
+
+.dashboard #content-main {
+ *width: 535px;
+}
+
+/* IE 6 ONLY */
+
+/* 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%;
+}
+
+/* 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/ie6.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/ie6.css 2008-10-31 23:03:43 UTC
(rev 9302)
+++ django/trunk/django/contrib/admin/media/css/ie6.css 2008-10-31 23:44:24 UTC
(rev 9303)
@@ -1,47 +0,0 @@
-/* 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
Modified: django/trunk/django/contrib/admin/templates/admin/base.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/base.html 2008-10-31
23:03:43 UTC (rev 9302)
+++ django/trunk/django/contrib/admin/templates/admin/base.html 2008-10-31
23:44:24 UTC (rev 9303)
@@ -3,7 +3,7 @@
<head>
<title>{% block title %}{% endblock %}</title>
<![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 lte IE 7]><link rel="stylesheet" type="text/css" href="{% block
stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.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
-~----------~----~----~----~------~----~------~--~---
