Django

Code

Changeset 9300

Show
Ignore:
Timestamp:
10/31/08 18:01:38 (2 months ago)
Author:
wilson
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/media/css/base.css

    r6716 r9300  
    11/* 
    22    DJANGO Admin 
    3     by Wilson Miner wilson@lawrence.com 
    43*/ 
    5  
    6 /* Block IE 5 */ 
    7 @import "null.css?\"\{"; 
    84 
    95/* Import other styles */ 
    106@import url('global.css'); 
    117@import url('layout.css'); 
    12  
    13 /* Import patch for IE 6 Windows */ 
    14 /*\*/ @import "patch-iewin.css"; /**/ 

  • django/trunk/django/contrib/admin/templates/admin/base.html

    r8984 r9300  
    33<head> 
    44<title>{% block title %}{% endblock %}</title> 
    5 <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /> 
     5<![if gte IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /><![endif]> 
     6<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie6 %}{% load adminmedia %}{% admin_media_prefix %}css/ie6.css{% endblock %}" /><![endif]--> 
    67{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %} 
    78{% block extrastyle %}{% endblock %}