fix header.html merge

This commit is contained in:
Michael Foster 2013-07-31 03:55:55 -04:00
parent a9f3f44c5f
commit 1ffabe2b93

View File

@ -4,6 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes">
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
{% if config.font_awesome %}<link rel="stylesheet" media="screen" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
<script type="text/javascript">var configRoot="{{ config.root }}";</script>
{% if not nojavascript %}
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
@ -25,4 +26,4 @@
.recaptchatable a {
display: block;
}
{% endraw %}</style>{% endif %}
{% endraw %}</style>{% endif %}