diff options
| author | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
| commit | 5a358a9ad5fc93c0db894e5e075b992f8b4e0cbd (patch) | |
| tree | 51b75c02f8a2467443956f9ed63c998fdd1ff31d /templates/base.html | |
| parent | d594e5dac52b2c3c4b8e462aa6f2c11d30165d28 (diff) | |
| parent | 40fdd2a51a8ef3eaa9571970ca0cd440d60ce762 (diff) | |
Merge branch 'master' of http://git.luxagraf.net/luxagraf
Conflicts:
apps/blog/models.py
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/base.html b/templates/base.html index ec35269..4abf87d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,12 +15,12 @@ type="application/rss+xml" title="RSS 2.0" href="http://feeds2.feedburner.com/luxagraf/blog"> - <link rel="stylesheet" + {%block stylesheet%}<link rel="stylesheet" href="{{MEDIA_URL}}css/base.css" - media="screen"> + media="screen">{%endblock%}{%comment%} <link rel="stylesheet" href="{{MEDIA_URL}}css/print.css" - media="print">{%block stylesheet%}{%endblock%} + media="print">{%endcomment%} <link rel="shortcut icon" href="http://media.luxagraf.net/img/favicon.ico" type="image/vnd.microsoft.icon"> |