jekyll-theme-hydejack 8.5.2 → 9.0.0

data/_includes/components/post-list-item.html

@@ -1,7 +1,7 @@
 {% assign post = include.post %}
 {% assign format = include.format | default:site.data.strings.date_formats.related_post | default:"%d %b %Y" %}
 
-<li>
-  <a href="{{ post.url | relative_url }}" class="h4 flip-title"><span>{{ post.title }}</span></a>
-  <time class="heading faded fine" datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date:format }}</time>
+<li class="h4">
+  <a href="{{ post.url | relative_url }}" class="flip-title"><span>{{ post.title }}</span></a>
+  <time class="faded fine" datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date:format }}</time>
 </li>

data/_includes/components/post.html

@@ -1,17 +1,18 @@
-{% assign post          = include.post          %}
-{% assign no_link_title = include.no_link_title %}
-{% assign no_excerpt    = include.no_excerpt    %}
-{% assign hide_image    = include.hide_image    %}
+{% assign post             = include.post             %}
+{% assign no_link_title    = include.no_link_title    %}
+{% assign no_excerpt       = include.no_excerpt       %}
+{% assign hide_image       = include.hide_image       %}
+{% assign hide_description = include.hide_description %}
 
 <article id="post{{ post.id | replace:'/','-' }}" class="page post mb6" role="article">
   <header>
-    <h1 class="post-title">
+    <h1 class="post-title flip-project-title">
       {% unless no_link_title %}<a href="{{ post.url | relative_url }}" class="flip-title">{% endunless %}
         {{ post.title }}
       {% unless no_link_title %}</a>{% endunless %}
     </h1>
 
-    <p class="post-date heading">
+    <div class="post-date">
       {% assign post_format = site.data.strings.date_formats.post | default:"%d %b %Y" %}
       <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date:post_format }}</time>
       {% assign category_start     = site.data.strings.category_start     | default:"in " %}
@@ -20,17 +21,19 @@
       {% assign tag_separator      = site.data.strings.tag_separator      | default:", "  %}
       {% include components/tag-list.html tags=post.categories meta=site.featured_categories start_with=category_start separator=category_separator %}
       {% include components/tag-list.html tags=post.tags meta=site.featured_tags start_with=tag_start separator=tag_separator %}
-    </p>
+    </div>
 
     {% assign alt = false %}
     {% unless hide_image %}{% if post.image %}
-      <div class="img lead sixteen-nine">
-        {% include components/hy-img.html img=post.image alt=post.title %}
-      </div>
+      {% unless no_link_title %}<a href="{{ post.url | relative_url }}" class="no-hover no-print-link {% unless post.hide_image %}flip-project{% endunless %}" tabindex="-1">{% endunless %}
+        <div class="lead aspect-ratio sixteen-nine flip-project-img">
+          {% include_cached components/hy-img.html img=post.image alt=post.title width=864 height=486 %}
+        </div>
+      {% unless no_link_title %}</a>{% endunless %}
       {% assign alt = '' %}
     {% endif %}{% endunless %}
 
-    {% include components/message.html text=post.description hide=page.hide_description alt=alt %}
+    {% include components/message.html text=post.description hide=hide_description alt=alt %}
   </header>
 
   {% if no_excerpt %}

data/_includes/components/related-posts.html

@@ -1,7 +1,13 @@
-{% assign post = include.post %}
+{% assign post = page %}
 
 {% if page.related_posts %}
-  {% assign related_posts = site.posts | where_exp:"post", "page.related_posts contains post.path" %}
+  {% if major >= 4 and minor >= 1 %}
+    {% assign related_posts = site.posts | where_exp:"post", "page.related_posts contains post.path or page.related_posts contains post.url" %}
+  {% else %}
+    {% assign related_posts_1 = site.posts | where_exp:"post", "page.related_posts contains post.path" %}
+    {% assign related_posts_2 = site.posts | where_exp:"post", "page.related_posts contains post.url" %}
+    {% assign related_posts = related_posts_1 | concat:related_posts_2 %}
+  {% endif %}
 {% elsif site.hydejack.use_lsi or site.use_lsi %}
   {% assign related_posts = site.related_posts %}
 {% elsif post.categories.first %}
@@ -14,11 +20,15 @@
 
 {% if related_posts.size > 0 %}
 <aside class="related mb4" role="complementary">
-  <h2 class="hr">{{ site.data.strings.related_posts | default:"Related Posts" }}</h2>
+  <h2 class="hr-bottom">{{ site.data.strings.related_posts | default:"Related Posts" }}</h2>
 
   <ul class="related-posts">
     {% for post in related_posts limit:3 %}
-      {% include components/post-list-item.html post=post %}
+      {% if post %}
+        {% include_cached components/post-list-item.html post=post %}
+      {% else %}
+        <li>Post with path <code>{{ post_path }}</code> not found.</li>
+      {% endif %}
     {% endfor %}
   </ul>
 </aside>

data/_includes/components/tag-list.html

@@ -11,7 +11,11 @@
   {% for tag_slug in tags %}
     {% capture iter_separator %}{% if forloop.last %}{{ end_with }}{% else %}{{ separator }}{% endif %}{% endcapture %}
 
-    {% assign tag = meta | where: "slug", tag_slug | first %}
+    {% if major >= 4 and minor >= 1 %}
+      {% assign tag = meta | find: "slug", tag_slug %}
+    {% else %}
+      {% assign tag = meta | where: "slug", tag_slug | first %}
+    {% endif %}
 
     {% if tag %}
       {% capture content_temp %}{{ content }}<a href="{{ tag.url | relative_url }}" class="flip-title">{{ tag.title }}</a>{{ iter_separator }}{% endcapture %}

data/_includes/head/css/inline

@@ -0,0 +1 @@
+{% capture to_scssify %}{% include styles/inline.scss %}{% endcapture %}{{ to_scssify | scssify }}

data/_includes/head/index.html

@@ -1,9 +1,15 @@
-{% assign google_fonts = site.google_fonts | default:"Roboto+Slab:400|Noto+Sans:400,400i,700,700i" %}
-{% assign font_heading = site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif"  %}
-{% assign font         = site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif" %}
-
-{% include head/meta.html %}
-{% include head/links.html %}
-{% include head/scripts.html %}
-{% include head/styles.html %}
+{% assign google_fonts = site.google_fonts %}
+{% assign font_heading = site.font_heading %}
+{% assign font         = site.font         %}
+
+{% include        head/meta.html %}
+{% include_cached head/meta-static.html %}
+
+{% include_cached head/links.html lang=page.lang %}
+{% include_cached head/links-static.html %}
+
+{% include_cached head/scripts.html %}
+
+{% include_cached head/styles.html layout=page.layout color=color theme_color=theme_color %}
+
 {% include my-head.html %}

data/_includes/head/links-static.html

@@ -0,0 +1,27 @@
+{% if plugins contains 'jekyll-feed' %}{% include head/feed-tag.html %}{% endif %}
+
+<link rel="shortcut icon"    href="{{ '/assets/icons/favicon.ico' | relative_url }}">
+<link rel="apple-touch-icon" href="{{ '/assets/icons/icon.png'    | relative_url }}">
+
+<link rel="manifest" href="{{ '/assets/manifest.json' | relative_url }}">
+
+{% if site.google_fonts %}
+  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
+  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+{% endif %}
+
+{% if site.google_analytics %}
+  <link rel="dns-prefetch" href="https://www.google-analytics.com">
+{% endif %}
+
+<link rel="preload" href="{{ '/assets/img/swipe.svg' | relative_url }}" as="image" id="_hrefSwipeSVG">
+
+{% if site.kramdown.math_engine == 'katex' %}
+  {% capture katex_url %}{{ 'assets/bower_components/katex/dist/katex.min.css' | relative_url }}{% endcapture %}
+  <link rel="dns-prefetch" href="{{ katex_url }}" id="_katexPreload">
+{% endif %}
+
+{% assign disqus = site.disqus | default:site.disqus_shortname %}
+{% if disqus %}
+<link rel="dns-prefetch" href="https://{{ disqus }}.disqus.com" id="_hrefDisqus">
+{% endif %}

data/_includes/head/links.html

@@ -1,33 +1,2 @@
-{% if plugins contains 'jekyll-feed' %}{% include head/feed-tag.html %}{% endif %}
-
-{% assign lang = page.lang | default:site.lang | default:'en' %}
+{% assign lang = include.lang | default:site.lang | default:'en' %}
 <link rel="alternate" href="{{ page.url | absolute_url }}" hreflang="{{ lang | downcase | replace:'_','-' }}">
-
-<link rel="shortcut icon" href="{{ '/assets/icons/favicon.ico' | relative_url }}">
-<link rel="apple-touch-icon" href="{{ '/assets/icons/icon.png' | relative_url }}">
-
-<link rel="manifest" href="{{ '/assets/manifest.json' | relative_url }}">
-
-{% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-{% endunless %}
-{% if site.google_analytics %}
-  <link rel="dns-prefetch" href="https://www.google-analytics.com">
-{% endif %}
-
-{% comment %}<!--
-  This is to avoid hard-coding URLs in JS (where they can't be discovered by automated tools).
--->{% endcomment %}
-<link rel="dns-prefetch" href="{{ '/'                                                                        | relative_url }}" id="_baseURL">
-<link rel="dns-prefetch" href="{{ '/sw.js'                                                                   | relative_url }}" id="_hrefSW">
-<link rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/katex.min.js'                         | relative_url }}" id="_hrefKatexJS">
-<link rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/katex.min.css'                        | relative_url }}" id="_hrefKatexCSS">
-<link rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/contrib/copy-tex.min.js'              | relative_url }}" id="_hrefKatexCopyJS">
-<link rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/contrib/copy-tex.min.css'             | relative_url }}" id="_hrefKatexCopyCSS">
-<link rel="dns-prefetch" href="{{ '/assets/img/swipe.svg'                                                    | relative_url }}" id="_hrefSwipeSVG">
-
-{% assign disqus = site.disqus | default:site.disqus_shortname %}
-{% if disqus %}
-<link rel="dns-prefetch" href="https://{{ disqus }}.disqus.com" id="_hrefDisqus">
-{% endif %}

data/_includes/head/meta-static.html

@@ -0,0 +1,18 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
+
+<meta name="mobile-web-app-capable" content="yes">
+
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-title" content="{{ site.title }}">
+<meta name="apple-mobile-web-app-status-bar-style" content="default">
+
+<meta name="application-name" content="{{ site.title }}">
+<meta name="msapplication-config" content="{{ '/assets/ieconfig.xml' | relative_url }}">
+
+{% unless site.hydejack.no_theme_color %}
+  <meta name="theme-color" content="{{ theme_color | default:'#193747' }}">
+{% endunless %}
+
+<meta name="generator" content="Hydejack v9.0.0" />

data/_includes/head/meta.html

@@ -1,14 +1,13 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<meta http-equiv="x-ua-compatible" content="ie=edge">
-
-{% if page.noindex %}
-<meta name="robots" content="noindex">
+{% if page.noindex or page.no_index or page.sitemap == false %}
+  <meta name="robots" content="noindex">
 {% endif %}
 
 {% unless page.redirect %}
-  {% if plugins contains 'jekyll-seo-tag' %}{% include head/seo-tag.html %}
-  {% else %}{% include head/seo-fallback.html %}{% endif %}
+  {% if plugins contains 'jekyll-seo-tag' %}
+    {% include head/seo-tag.html %}
+  {% else %}
+    {% include head/seo-fallback.html %}
+  {% endif %}
 
   {% if site.keywords.size > 0 or page.keywords.size > 0 %}
     <meta name="keywords" content="{{ page.keywords | default:site.keywords | join:',' }}">
@@ -16,19 +15,4 @@
 {% else %}
   <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
   <title>{{ site.data.strings.redirecting | default:"Redirecting..." }}</title>
-{% endunless %}
-
-<meta name="mobile-web-app-capable" content="yes">
-
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-title" content="{{ site.title }}">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-
-<meta name="application-name" content="{{ site.title }}">
-<meta name="msapplication-config" content="{{ '/assets/ieconfig.xml' | relative_url }}">
-
-{% unless site.hydejack.no_theme_color %}
-<meta name="theme-color" content="{{ theme_color | default:'#193747' }}">
-{% endunless %}
-
-<meta name="generator" content="Hydejack v8.5.2" />
+{% endunless %}

data/_includes/head/page-style.html

@@ -1,6 +1,4 @@
 <style id="_pageStyle">
-{% capture page_style %}
-  {% include styles/page-style.scss color=color theme_color=theme_color %}
-{% endcapture %}
+{% capture page_style %}{% include_cached styles/page-style.scss color=include.color theme_color=include.theme_color %}{% endcapture %}
 {{ page_style | scssify }}
 </style>

data/_includes/head/scripts.html

@@ -1,9 +1,14 @@
-<script>
-{% include scripts/load-js.min.js %};
-{% include scripts/loadCSS.min.js %};
-{% include scripts/cssrelpreload.min.js %};
-!function(w, d) {
+<script>{% include scripts/load-js.min.js %}{% include scripts/loadCSS.min.js %}{% include scripts/cssrelpreload.min.js %}!function(w) {
+  w._baseURL = '{{    "/"           | relative_url }}';
+  w._publicPath = '{{ "/assets/js/" | relative_url }}';
   w._noPushState = {{ site.hydejack.no_push_state | default:site.disable_push_state | default:false }};
-  w._noDrawer = {{ site.hydejack.no_drawer | default:site.disable_drawer | default:false }};
-}(window, document);
+  w._noDrawer = {{    site.hydejack.no_drawer     | default:site.disable_drawer     | default:false }};
+  w._noNavbar = {{    site.hydejack.no_navbar     | default:false }};
+  w._noToc = {{       site.hydejack.no_toc        | default:false }};
+  w._noSearch = {{    site.hydejack.no_search     | default:false }};
+}(window);
 </script>
+
+{% if site.kramdown.math_engine == 'mathjax' %}
+<script async src="{{ 'assets/bower_components/MathJax/es5/tex-mml-chtml.js' | relative_url }}" id="_MathJax"></script>
+{% endif %}

data/_includes/head/styles-inline.html

@@ -0,0 +1,19 @@
+{% assign google_fonts = site.google_fonts %}
+{% capture style_url %}{{ 'assets/css/hydejack-9.0.0.css' | relative_url }}{% endcapture %}
+{% capture icons_url %}{{ 'assets/icomoon/style.css' | relative_url }}{% endcapture %}
+{% if google_fonts %}{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}{% endif %}
+
+<link rel="preload" as="style" href="{{ style_url }}" id="_stylePreload">
+<link rel="preload" as="style" href="{{ icons_url }}" id="_iconsPreload">
+{% if google_fonts %}<link rel="preload" as="style" href="{{ fonts_url }}" id="_fontsPreload">{% endif %}
+
+<script>
+  setRel('_stylePreload');
+  setRel('_iconsPreload');
+  /*{% if google_fonts %}*/setRel('_fontsPreload');/*{% endif %}*/
+</script>
+<noscript>
+  <link rel="stylesheet" href="{{ style_url }}">
+  <link rel="stylesheet" href="{{ icons_url }}">
+  {% if google_fonts %}<link rel="stylesheet" href="{{ fonts_url }}">{% endif %}
+</noscript>

data/_includes/head/styles-layout.html

@@ -0,0 +1,4 @@
+{% assign layout = include.layout %}
+<style id="_styleInline">
+  {% include_cached head/css/inline %}
+</style>

data/_includes/head/styles-no-inline.html

@@ -0,0 +1,8 @@
+{% assign google_fonts = site.google_fonts %}
+{% capture style_url %}{{ 'assets/css/hydejack-9.0.0.css' | relative_url }}{% endcapture %}
+{% capture icons_url %}{{ 'assets/icomoon/style.css' | relative_url }}{% endcapture %}
+{% if google_fonts %}{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}{% endif %}
+
+<link rel="stylesheet" href="{{ style_url }}" id="_stylePreload">
+<link rel="stylesheet" href="{{ icons_url }}" id="_iconsPreload">
+{% if google_fonts %}<link rel="stylesheet" href="{{ fonts_url }}" id="_fontsPreload">{% endif %}

data/_includes/head/styles.html

@@ -1,41 +1,12 @@
 <!--[if gt IE 8]><!---->
-{% capture style_url %}{% link assets/css/hydejack-8.5.2.css %}{% endcapture %}
-{% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
-{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts }}&display=swap{% endcapture %}
-
-{% assign font_heading = site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif" %}
-{% assign font         = site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif" %}
-
-{% assign layout = page.layout %}
-{% assign no_google_fonts = site.hydejack.no_google_fonts or site.no_google_fonts %}
-
 {% if site.hydejack.no_inline_css or jekyll.environment == 'development' %}
-  <link rel="stylesheet" href="{{ style_url | relative_url }}">
-  <link rel="stylesheet" href="{{ icons_url | relative_url }}">
-  {% unless no_google_fonts %}
-    <link rel="stylesheet" href="{{ fonts_url }}">
-  {% endunless %}
+  {% include_cached head/styles-no-inline.html %}
 {% else %}
-  <style>
-    {% capture to_scssify %}{% include styles/inline.scss %}{% endcapture %}{{ to_scssify | scssify }}
-  </style>
-
-  <link rel="preload" as="style" href="{{ style_url | relative_url }}" id="_stylePreload">
-  <link rel="preload" as="style" href="{{ icons_url | relative_url }}" id="_iconsPreload">
-  {% unless no_google_fonts %}
-    <link rel="preload" as="style" href="{{ fonts_url }}" id="_fontsPreload">
-  {% endunless %}
-
-  <script>setRel('_stylePreload');setRel('_iconsPreload');/*{% unless no_google_fonts %}*/setRel('_fontsPreload');/*{% endunless %}*/</script>
-  <noscript>
-    <link rel="stylesheet" href="{{ style_url | relative_url }}">
-    <link rel="stylesheet" href="{{ icons_url | relative_url }}">
-    {% unless no_google_fonts %}
-      <link rel="stylesheet" href="{{ fonts_url }}">
-    {% endunless %}
-  </noscript>
+  {% include_cached head/styles-layout.html layout=include.layout %}
+  {% include_cached head/styles-inline.html %}
 {% endif %}
+
 {% unless site.hydejack.no_page_style %}
-  {% include head/page-style.html %}
+  {% include_cached head/page-style.html color=include.color theme_color=include.theme_color %}
 {% endunless %}
 <!--<![endif]-->

data/_includes/header.txt

@@ -9,5 +9,5 @@
  *                 /\___/                \ \____/
  *                 \/__/                  \/___/
  *
- * Powered by Hydejack v8.5.2 <https://hydejack.com/>
+ * Powered by Hydejack v9.0.0 <https://hydejack.com/>
  */

data/_includes/if-non-null

@@ -0,0 +1,7 @@
+{% capture maybe %}{% include {{ include.try }} %}{% endcapture %}
+{% assign  maybe = maybe | strip_newlines %}
+{% if maybe.size > 0 %}
+  {{ maybe }}
+{% elsif include.fallback %}
+  {% include {{ include.fallback }} %}
+{% endif %}

data/_includes/my-body.html

@@ -15,7 +15,7 @@ Example code for using Matamo as alternative analytics solution.
   _paq.push(['setTrackerUrl', u+'piwik.php']);
   _paq.push(['setSiteId', '{{site.matomo_analytics.site_id}}']);
 
-  var pushStateEl = document.getElementsByTagName('hy-push-state')[0];
+  var pushStateEl = document.getElementById('_pushState');
   var timeStartLoadPage, referer, timeItTookToLoadPage;
 
   pushStateEl.addEventListener('hy-push-state-start', function() {

data/_includes/my-scripts.html

@@ -6,7 +6,7 @@ it will only run on the initial page.
 The snippet below will run the code on every `hy-push-state-load` event instead.
 -->
 <script>
-  document.getElementsByTagName('hy-push-state')[0].addEventListener('hy-push-state-load', function (e) {
+  document.getElementById('_pushState').addEventListener('hy-push-state-load', function (e) {
     function e(e){
       (console.error?console.error:console.log).call(console,e)
     }

data/_includes/smart-url

@@ -0,0 +1 @@
+{% assign url = include.url %}{% if url contains '://' %}{{ url }}{% else %}{% assign url = url | remove_first:site.baseurl %}{{ url | relative_url }}{% endif %}

data/_includes/smart-url.txt

@@ -1 +1 @@
-{% assign url = include.url %}{% if url contains '//' %}{{ url }}{% else %}{% assign url = url | remove_first:site.baseurl %}{{ url | relative_url }}{%- endif -%}
+{% comment %} Retained for backwards compatibility. Use smart-url (without .txt) instead. {% endcomment %}{% include smart-url url=include.url %}

data/_includes/styles/common.scss

@@ -0,0 +1,18 @@
+.note:before {
+  content: "{{ site.data.strings.note | default:'Note' }}";
+}
+.page > header > .note-sm:before {
+  content: "{{ site.data.strings.description | default:'Description' }}";
+}
+#markdown-toc:before {
+  content: "{{ site.data.strings.toc | default:'Table of Contents' }}";
+}
+.layout-resume .note-sm:before {
+  content: "{{ site.data.strings.resume.summary | default:'Summary' }}";
+}
+
+{% if site.hydejack.no_page_style %}
+  {% assign color       = site.accent_color | default:'#4fb1ba' %}
+  {% assign theme_color = site.theme_color  | default:'#193747' %}
+  {% include_cached styles/page-style.scss color=color theme_color=theme_color %}
+{% endif %}

data/_includes/styles/inline.scss

@@ -1,31 +1,25 @@
-// Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
+// Copyright (c) 2019 Florian Klampfer <https://qwtel.com/>
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
 //
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-$font-family-heading: {{ site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif" }};
-$font-family:         {{ site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif"   }};
-$theme-color:         {{ site.theme_color  | default:'#193747' }};
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+{% include styles/variables.scss %}
 @import "variables";
 @import "my-variables";
 @import "mixins";
 
+@import "html";
+
 @import "pooleparty/__inline__/base";
 @import "pooleparty/__inline__/type";
 @import "pooleparty/__inline__/table";
@@ -45,6 +39,7 @@ $theme-color:         {{ site.theme_color  | default:'#193747' }};
 @import "hydejack/__inline__/sidebar";
 @import "hydejack/__inline__/social";
 @import "hydejack/__inline__/menu";
+@import "hydejack/__inline__/toc";
 @import "hydejack/__inline__/content";
 @import "hydejack/__inline__/avatar";
 @import "hydejack/__inline__/katex";
@@ -52,11 +47,4 @@ $theme-color:         {{ site.theme_color  | default:'#193747' }};
 
 @import "my-inline";
 
-html { font-family: $font-family; }
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: $font-family-heading; }
-
-{% if site.hydejack.no_page_style %}
-  {% assign color       = site.accent_color | default:'#4fb1ba' %}
-  {% assign theme_color = site.theme_color  | default:'#193747' %}
-  {% include styles/page-style.scss color=color theme_color=theme_color %}
-{% endif %}
+{% include styles/common.scss %}