12 files changed, 27 insertions, 32 deletions
diff --git a/theme/templates/ebook/glossary.html b/theme/templates/ebook/glossary.html
index 8076c4d..ce10c63 100644
--- a/theme/templates/ebook/glossary.html
+++ b/theme/templates/ebook/glossary.html
@@ -1,4 +1,4 @@
-{% extends "./layout.html" %}
+{% extends "./page.html" %}
 
 {% block title %}Glossary | {{ title }}{% endblock %}
 
diff --git a/theme/templates/ebook/page.html b/theme/templates/ebook/page.html
index 9ce7c1b..3af7970 100644
--- a/theme/templates/ebook/page.html
+++ b/theme/templates/ebook/page.html
@@ -3,14 +3,17 @@
 {% block title %}{{ progress.current.title }} | {{ title }}{% endblock %}
 
 {% block style %}
-<link rel="stylesheet" href="{{ staticBase }}/print.css">
-{% for resource in plugins.resources.css %}
-    {% if resource.url %}
-    <link rel="stylesheet" href="{{ resource.url }}">
-    {% else %}
-    <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
-    {% endif %}
-{% endfor %}
+    <link rel="stylesheet" href="{{ staticBase }}/print.css">
+    {% for resource in plugins.resources.css %}
+        {% if resource.url %}
+        <link rel="stylesheet" href="{{ resource.url }}">
+        {% else %}
+        <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
+        {% endif %}
+    {% endfor %}
+    {% for style in styles %}
+        <link rel="stylesheet" href="{{ basePath }}/{{ style }}">
+    {% endfor %}
 {% endblock %}
 
 {% block content %}
diff --git a/theme/templates/ebook/summary.html b/theme/templates/ebook/summary.html
index dfbba2c..ab4b78f 100644
--- a/theme/templates/ebook/summary.html
+++ b/theme/templates/ebook/summary.html
@@ -1,18 +1,7 @@
-{% extends "./layout.html" %}
+{% extends "./page.html" %}
 
 {% block title %}Table of Contents | {{ title }}{% endblock %}
 
-{% block style %}
-<link rel="stylesheet" href="{{ staticBase }}/print.css">
-{% for resource in plugins.resources.css %}
-    {% if resource.url %}
-    <link rel="stylesheet" href="{{ resource.url }}">
-    {% else %}
-    <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
-    {% endif %}
-{% endfor %}
-{% endblock %}
-
 {% macro articles(_articles) %}
     {% for item in _articles %}
         {% set externalLink = item.path|isExternalLink %}
diff --git a/theme/templates/book/glossary.html b/theme/templates/website/glossary.html
index 4d9683f..4d9683f 100644
--- a/theme/templates/book/glossary.html
+++ b/theme/templates/website/glossary.html
diff --git a/theme/templates/book/includes/exercise.html b/theme/templates/website/includes/exercise.html
index 42b500f..42b500f 100644
--- a/theme/templates/book/includes/exercise.html
+++ b/theme/templates/website/includes/exercise.html
diff --git a/theme/templates/book/includes/font-settings.html b/theme/templates/website/includes/font-settings.html
index 5fa1f3e..5fa1f3e 100644
--- a/theme/templates/book/includes/font-settings.html
+++ b/theme/templates/website/includes/font-settings.html
diff --git a/theme/templates/book/includes/header.html b/theme/templates/website/includes/header.html
index ef2de60..ef2de60 100644
--- a/theme/templates/book/includes/header.html
+++ b/theme/templates/website/includes/header.html
diff --git a/theme/templates/book/includes/quiz.html b/theme/templates/website/includes/quiz.html
index 425fa39..425fa39 100644
--- a/theme/templates/book/includes/quiz.html
+++ b/theme/templates/website/includes/quiz.html
diff --git a/theme/templates/book/includes/summary.html b/theme/templates/website/includes/summary.html
index 8f6e4c8..3fff7fe 100644
--- a/theme/templates/book/includes/summary.html
+++ b/theme/templates/website/includes/summary.html
@@ -56,7 +56,7 @@
         {% if options.links.gitbook !== false %}
         <li class="divider"></li>
         <li>
-            <a href="http://www.gitbook.io/" target="blank" class="gitbook-link">Published using GitBook</a>
+            <a href="https://www.gitbook.com" target="blank" class="gitbook-link">Published using GitBook</a>
         </li>
         {% endif %}
     </ul>
diff --git a/theme/templates/book/langs.html b/theme/templates/website/langs.html
index 49878ae..7b47fc5 100755
--- a/theme/templates/book/langs.html
+++ b/theme/templates/website/langs.html
@@ -1,4 +1,4 @@
-{% extends "../layout.html" %}
+{% extends "./layout.html" %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/theme/templates/layout.html b/theme/templates/website/layout.html
index 5dc7c5e..5dc7c5e 100755..100644
--- a/theme/templates/layout.html
+++ b/theme/templates/website/layout.html
diff --git a/theme/templates/book/page.html b/theme/templates/website/page.html
index d1379a2..91f2162 100644
--- a/theme/templates/book/page.html
+++ b/theme/templates/website/page.html
@@ -1,4 +1,4 @@
-{% extends "../layout.html" %}
+{% extends "./layout.html" %}
 
 {% block head %}
     {% parent %}
@@ -66,12 +66,15 @@ require(["gitbook"], function(gitbook) {
 {% endblock %}
 
 {% block style %}
-<link rel="stylesheet" href="{{ staticBase }}/style.css">
-{% for resource in plugins.resources.css %}
-    {% if resource.url %}
-    <link rel="stylesheet" href="{{ resource.url }}">
-    {% else %}
-    <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
-    {% endif %}
-{% endfor %}
+    <link rel="stylesheet" href="{{ staticBase }}/style.css">
+    {% for resource in plugins.resources.css %}
+        {% if resource.url %}
+        <link rel="stylesheet" href="{{ resource.url }}">
+        {% else %}
+        <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
+        {% endif %}
+    {% endfor %}
+    {% for style in styles %}
+        <link rel="stylesheet" href="{{ basePath }}/{{ style }}">
+    {% endfor %}
 {% endblock %}