diff options
-rwxr-xr-x | theme/templates/layout.html | 3 | ||||
-rw-r--r-- | theme/templates/site.html | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/theme/templates/layout.html b/theme/templates/layout.html index 8e447b1..7f0a83f 100755 --- a/theme/templates/layout.html +++ b/theme/templates/layout.html @@ -3,7 +3,6 @@ {{ htmlSnippet("html:start")|default("") }} <head> {{ htmlSnippet("head:start")|default("") }} - {% block head %} <meta charset="UTF-8"> <title>{% block title %}{% endblock %}</title> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> @@ -14,7 +13,7 @@ <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon"> - {% endblock %} + {% block head %}{% endblock %} {{ htmlSnippet("head:end")|default("") }} </head> <body> diff --git a/theme/templates/site.html b/theme/templates/site.html index c44612c..6fcbebd 100644 --- a/theme/templates/site.html +++ b/theme/templates/site.html @@ -2,9 +2,6 @@ {% block htmlTag %}{% if options.cache !== false %}manifest="{{ basePath }}/manifest.appcache"{% endif %}{% endblock %} -{% block title %}{{ progress.current.title }} | {{ title }}{% endblock %} -{% block description %}{% if progress.current.level == "0" %}{{ description }}{% endif %}{% endblock %} - {% block head %} {% parent %} {% if githubAuthor %} @@ -18,6 +15,9 @@ {% endif %} {% endblock %} +{% block title %}{{ progress.current.title }} | {{ title }}{% endblock %} +{% block description %}{% if progress.current.level == "0" %}{{ description }}{% endif %}{% endblock %} + {% block content %} <div class="book" {% if githubId %}data-github="{{ githubId }}"{% endif %} data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}"> {% include "includes/book/header.html" %} |