diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-12 10:06:54 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-12 10:06:54 -0300 |
| commit | 4fd629362fb35f6f684479f2464841cdddbed8a4 (patch) | |
| tree | a61287945d4a085585776613545d795c9885bd23 | |
| parent | fa0dffea12e40d1dce396813c603753b321537c1 (diff) | |
| parent | c0faf87ca59d7f76e30e124886288bdcfbf8b474 (diff) | |
| download | askbot-4fd629362fb35f6f684479f2464841cdddbed8a4.tar.gz askbot-4fd629362fb35f6f684479f2464841cdddbed8a4.tar.bz2 askbot-4fd629362fb35f6f684479f2464841cdddbed8a4.zip | |
Merge branch 'new-template' into new-template-experimental
| -rw-r--r-- | askbot/skins/default/templates/base.html | 1 | ||||
| -rw-r--r-- | askbot/skins/default/templates/head/stylesheets.html | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 4f34a8b5..9d767067 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -7,6 +7,7 @@ {% include "head/meta.html" %} <link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" /> {% include "head/stylesheets.html" %} + {% block forestyle %}{% endblock %} {% include "head/javascript.html" %} {% if settings.USE_CUSTOM_HTML_HEAD %} {{ settings.CUSTOM_HTML_HEAD }} diff --git a/askbot/skins/default/templates/head/stylesheets.html b/askbot/skins/default/templates/head/stylesheets.html index 916978c2..9d5aebad 100644 --- a/askbot/skins/default/templates/head/stylesheets.html +++ b/askbot/skins/default/templates/head/stylesheets.html @@ -8,7 +8,6 @@ type="text/css" /> {% endif %} -{% block forestyle %}{% endblock %} {% if user_messages %} <style type="text/css"> body { margin-top:2.4em; } |