Fixed #24053 -- Removed admin CSS & images for IE6 & 7.

4 files changed, 2 insertions, 67 deletions

diff --git a/django/contrib/admin/static/admin/css/ie.css b/django/contrib/admin/static/admin/css/ie.css
deleted file mode 100644
index 8199005877..0000000000
--- a/django/contrib/admin/static/admin/css/ie.css
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 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;
-}
-
-/* IE doesn't know alpha transparency in PNGs */
-
-.inline-deletelink {
-    background: transparent url(../img/inline-delete-8bit.png) no-repeat;
-}
-
-/* IE7 doesn't support inline-block */
-.change-list ul.toplinks li {
-    zoom: 1;
-    *display: inline;
-}
diff --git a/django/contrib/admin/static/admin/img/inline-delete-8bit.png b/django/contrib/admin/static/admin/img/inline-delete-8bit.png
deleted file mode 100644
index 01ade88c53..0000000000
--- a/django/contrib/admin/static/admin/img/inline-delete-8bit.png
+++ /dev/null
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index 1c7a9a7ae2..b9e880e03a 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -5,7 +5,6 @@
 <title>{% block title %}{% endblock %}</title>
 <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
 {% block extrastyle %}{% endblock %}
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.css" %}{% endblock %}" /><![endif]-->
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
 <script type="text/javascript">window.__admin_utc_offset__ = "{% filter escapejs %}{% now "Z" %}{% endfilter %}";</script>
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index b480bd6b9e..9abb05d921 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -165,12 +165,11 @@ Backwards incompatible changes in 1.9
     deprecation timeline for a given feature, its removal may appear as a
     backwards incompatible change.
 
-...
-
 Miscellaneous
 ~~~~~~~~~~~~~
 
-* ...
+* CSS and images in ``contrib.admin`` to support Internet Explorer 6 & 7 have
+  been removed as these browsers have reached end-of-life.
 
 .. _deprecated-features-1.9: