Commit 902df97f authored by Wilson Miner's avatar Wilson Miner
Browse files

Removed the hidden import rules in the contrib.admin stylesheets. Each... 

Removed the hidden import rules in the contrib.admin stylesheets. Each individual stylesheet is now linked to explicitly from the template where it's used (in the extrastyle block), with the exception of widgets.css, which is imported by forms.css, but still available separately for reuse. Also moved the override stylesheets (IE and RTL) below the extrastyle block and all styles within the conditional comment which blocks CSS from IE5 and lower.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 2246d526

django/contrib/admin/media/css/changelists.css

+0 −2
Original line number Diff line number Diff line 
@import url('base.css');



/* CHANGELISTS */



#changelist {

django/contrib/admin/media/css/dashboard.css

+0 −2
Original line number Diff line number Diff line 
@import url('base.css');



/* DASHBOARD */



.dashboard .module table th {

django/contrib/admin/media/css/forms.css

+0 −1
Original line number Diff line number Diff line 
@import url('base.css');

@import url('widgets.css');



/* FORM ROWS */

django/contrib/admin/media/css/login.css

+0 −2
Original line number Diff line number Diff line 
@import url('base.css');



/* LOGIN FORM */



body.login {

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

+4 −2
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
<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>

<![if gte IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /><![endif]>

<![if gte IE 6]><!-- Block all styles from IE5 and lower -->

<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />

{% block extrastyle %}{% endblock %}

<!--[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 %}

<![endif]>

{% block extrahead %}{% endblock %}

{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}

</head>