diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-07-31 03:55:55 -0400 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-07-31 03:55:55 -0400 |
| commit | 1ffabe2b930a72995be9c4b1699ebd0dab22827d (patch) | |
| tree | ab75ade1d66b0fc629653bb42d82331efdedd8b7 /templates/header.html | |
| parent | a9f3f44c5ffc355df7831eed29b08e0dd2b398fc (diff) | |
fix header.html merge
Diffstat (limited to 'templates/header.html')
| -rw-r--r-- | templates/header.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/header.html b/templates/header.html index 95e0bc09..3791296f 100644 --- a/templates/header.html +++ b/templates/header.html @@ -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 %}
\ No newline at end of file |