Skip to content
Browse files

Applied contrib.admin IE CSS patches to IE6 and 7, and added simple h…

…acks to filter some rules to both and some only to IE6.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 5053550 commit 6b82c386f617fd2f0f92e3991d2d5f77ba572cd0 Wilson Miner committed
Showing with 25 additions and 21 deletions.
  1. +24 −20 django/contrib/admin/media/css/{ie6.css → ie.css}
  2. +1 −1 django/contrib/admin/templates/admin/base.html
View
44 django/contrib/admin/media/css/ie6.css → django/contrib/admin/media/css/ie.css
@@ -1,47 +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;
+ _position: static;
}
/* Put the right sidebars back on the page */
.colMS #content-related {
- margin-right: 0;
- margin-left: 10px;
- position: static;
+ _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;
+ _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;
+ _height: 1%;
}
/* Fix right margin for changelist filters in IE6 */
#changelist-filter ul {
- margin-right: -10px;
+ _margin-right: -10px;
}
/* IE ignores min-height, but treats height as if it were min-height */
.change-list .filtered {
- height: 400px;
+ _height: 400px;
}
View
2 django/contrib/admin/templates/admin/base.html
@@ -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 %}

0 comments on commit 6b82c38

Please sign in to comment.
Something went wrong with that request. Please try again.