jekyll-theme-hydejack 7.5.2 → 8.0.0

data/_includes/my-scripts.html

@@ -0,0 +1,55 @@
+{% comment %}
+<!--
+Example code for the CloudFlare mail protection script.
+CloudFlare will inject this on every page, but due to Hydejack's push state approach to page loading,
+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) {
+    function e(e){
+      (console.error?console.error:console.log).call(console,e)
+    }
+
+    function t(e){
+      return l.innerHTML='<a href="'+e.replace(/"/g,"&quot;")+'"></a>',l.childNodes[0].getAttribute("href")
+    }
+
+    function r(e,t){
+      var r=e.substr(t,2);return parseInt(r,16)
+    }
+
+    function n(e,n){
+      for(var o="",c=r(e,n),a=n+2;a<e.length;a+=2){
+        var l=r(e,a)^c;
+        o+=String.fromCharCode(l)
+      }
+      return t(o)
+    }
+
+    var o="/cdn-cgi/l/email-protection#",
+        c=".__cf_email__",
+        a="data-cfemail",
+        l=document.createElement("div");
+
+    !function(){
+      for(var t=document.getElementsByTagName("a"),r=0;r<t.length;r++)
+        try{
+          var c=t[r],a=c.href.indexOf(o);
+          a>-1&&(c.href="mailto:"+n(c.href,a+o.length))
+        }catch(t){
+          e(t)
+        }
+    }(),
+    function(){
+      for(var t=document.querySelectorAll(c),r=0;r<t.length;r++)
+        try{
+          var o=t[r],l=n(o.getAttribute(a),0),i=document.createTextNode(l);
+          o.parentNode.replaceChild(i,o)
+        }catch(t){
+          e(t)
+        }
+    }()
+  });
+</script>
+{% endcomment %}

data/_includes/scripts/load-js.js

@@ -0,0 +1,60 @@
+// Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
+//
+// 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.
+//
+// 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.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Compress via uglify:
+// uglifyjs load-js.js -c -m > load-js.min.js
+!function(window, document) {
+  'use strict';
+
+  function addEvent(el, type, cb, opts) {
+    if (el.addEventListener) el.addEventListener(type, cb, opts);
+    else if (el.attachEvent) el.attachEvent('on' + type, cb);
+    else el['on' + type] = cb;
+  }
+
+  window.loadJS = function(src, cb) {
+    var script = document.createElement('script');
+    script.src = src;
+    if (cb) addEvent(script, 'load', cb, { once: true });
+    var ref = document.scripts[0];
+    ref.parentNode.insertBefore(script, ref);
+
+    return script;
+  };
+
+  window._loaded = false;
+  window.loadJSDeferred = function(src, cb) {
+    var script = document.createElement('script');
+    script.src = src;
+
+    function insert() {
+      window._loaded = true;
+      if (cb) addEvent(script, 'load', cb, { once: true });
+      var ref = document.scripts[0];
+      ref.parentNode.insertBefore(script, ref);
+    }
+
+    if (window._loaded) insert();
+    else addEvent(window, 'load', insert, { once: true });
+
+    return script;
+  };
+
+  window.setRel = window.setRelStylesheet = function (id) {
+    var link = document.getElementById(id);
+    function set() { this.rel = 'stylesheet'; }
+    addEvent(link, 'load', set, { once: true });
+  };
+}(window, document);

data/_includes/scripts/load-js.min.js

@@ -0,0 +1 @@
+!function(e,t){"use strict";function n(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r):e.attachEvent?e.attachEvent("on"+t,n):e["on"+t]=n}e.loadJS=function(e,r){var o=t.createElement("script");o.src=e,r&&n(o,"load",r,{once:!0});var a=t.scripts[0];return a.parentNode.insertBefore(o,a),o},e._loaded=!1,e.loadJSDeferred=function(r,o){function a(){e._loaded=!0,o&&n(d,"load",o,{once:!0});var r=t.scripts[0];r.parentNode.insertBefore(d,r)}var d=t.createElement("script");return d.src=r,e._loaded?a():n(e,"load",a,{once:!0}),d},e.setRel=e.setRelStylesheet=function(e){function n(){this.rel="stylesheet"}var r=t.getElementById(e);r.addEventListener?r.addEventListener("load",n,{once:!0}):r.onload=n}}(window,document);

data/_includes/styles/inline.scss

@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-{% 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 font_heading = site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif" %}
+{% assign font =         site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif" %}
 
 $font-family-heading: {{ font_heading }};
 $font-family: {{ font }};
@@ -28,9 +28,6 @@ $font-family: {{ font }};
 @import "my-variables";
 @import "mixins";
 
-// @import "reboot-mod";
-
-
 @import "pooleparty/__inline/base";
 @import "pooleparty/__inline/type";
 @import "pooleparty/__inline/table";
@@ -39,10 +36,14 @@ $font-family: {{ font }};
 @import "pooleparty/__inline/code";
 @import "pooleparty/__inline/posts";
 @import "pooleparty/__inline/related";
+@import "pooleparty/__inline/read-more";
 @import "pooleparty/__inline/message";
 @import "pooleparty/__inline/pagination";
 
 @import "hydejack/__inline/base";
+@import "hydejack/__inline/utilities";
+@import "hydejack/__inline/links";
+@import "hydejack/__inline/images";
 @import "hydejack/__inline/sidebar";
 @import "hydejack/__inline/social";
 @import "hydejack/__inline/menu";
@@ -51,23 +52,18 @@ $font-family: {{ font }};
 @import "hydejack/__inline/katex";
 @import "hydejack/__inline/footer";
 
-// {% unless site.hydejack.no_mark_external or site.no_mark_external %}
-//   @import "hydejack/__link/mark-external";
-// {% endunless %}
-// {% unless site.hydejack.no_break_layout %}
-//   @import "hydejack/__link/break-layout";
-// {% endunless %}
-
-// @import "syntax";
-// @import "spinner";
-
 @import "my-inline";
 // @import "my-style";
 
 {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
-  {% assign font = font | split:',' | shift | join:',' %}
-  {% assign font_heading = font_heading | split:',' | shift | join:',' %}
+  {% assign font2 = font | split:',' | shift | join:',' %}
+  {% assign font_heading2 = font_heading | split:',' | shift | join:',' %}
 {% endunless %}
 
-html { font-family: {{ font | default:"serif" }}; }
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading | default:"serif" }}; }
+html { font-family: {{ font2 | default:"serif" }}; }
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading2 | default:"serif" }}; }
+
+.font-active {
+  font-family: $font-family;
+  h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: $font-family-heading; }
+}

data/_includes/styles/style.scss

@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-{% 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 font_heading = site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif" %}
+{% assign font =         site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif" %}
 
 $font-family-heading: {{ font_heading }};
 $font-family: {{ font }};
@@ -39,10 +39,14 @@ $font-family: {{ font }};
   @import "pooleparty/__link/code";
   @import "pooleparty/__link/posts";
   @import "pooleparty/__link/related";
+  @import "pooleparty/__link/read-more";
   @import "pooleparty/__link/message";
   @import "pooleparty/__link/pagination";
 
   @import "hydejack/__link/base";
+  @import "hydejack/__link/utilities";
+  @import "hydejack/__link/links";
+  @import "hydejack/__link/images";
   @import "hydejack/__link/sidebar";
   @import "hydejack/__link/social";
   @import "hydejack/__link/menu";
@@ -63,16 +67,6 @@ $font-family: {{ font }};
 
   // @import "my-inline";
   @import "my-style";
-
-  {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
-    .wf-active {
-      font-family: {{ font }};
-
-      h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading {
-        font-family: {{ font_heading }};
-      }
-    }
-  {% endunless %}
 {% else %}
   @import "pooleparty/_base.pre.scss";
   @import "pooleparty/_type.pre.scss";
@@ -82,10 +76,14 @@ $font-family: {{ font }};
   @import "pooleparty/_code.pre.scss";
   @import "pooleparty/_posts.pre.scss";
   @import "pooleparty/_related.pre.scss";
+  @import "pooleparty/_read-more.pre.scss";
   @import "pooleparty/_message.pre.scss";
   @import "pooleparty/_pagination.pre.scss";
 
   @import "hydejack/_base.pre.scss";
+  @import "hydejack/_utilities.pre.scss";
+  @import "hydejack/_links.pre.scss";
+  @import "hydejack/_images.pre.scss";
   @import "hydejack/_sidebar.pre.scss";
   @import "hydejack/_social.pre.scss";
   @import "hydejack/_menu.pre.scss";
@@ -107,11 +105,16 @@ $font-family: {{ font }};
   @import "my-inline";
   @import "my-style";
 
-  html {
-    font-family: {{ font }};
-  }
+  {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
+    {% assign font = font | split:',' | shift | join:',' %}
+    {% assign font_heading = font_heading | split:',' | shift | join:',' %}
+  {% endunless %}
+
+  html { font-family: {{ font | default:"serif" }}; }
+  h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading | default:"serif" }}; }
 
-  h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading {
-    font-family: {{ font_heading }};
+  .font-active {
+    font-family: $font-family;
+    h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: $font-family-heading; }
   }
 {% endunless %}

data/_includes/templates/animation.html

@@ -1,4 +1,4 @@
-<template id="_animation-template">
+<template id="_animation-template" hidden>
   <div class="animation-main fixed-top">
     <div class="content">
       <div class="page"></div>

data/_includes/templates/back.html

@@ -1,4 +1,4 @@
-<template id="_back-template">
+<template id="_back-template" hidden>
   <a id="_back" class="back nav-btn no-hover">
     <span class="sr-only">{{ strings.back | default:"Back" }}</span>
     <span class="icon-arrow-left2"></span>

data/_includes/templates/cookies-banner.html

@@ -1,4 +1,4 @@
-<template id="_cookies-banner-template">
+<template id="_cookies-banner-template" hidden>
   <div id="_cookies-banner" class="navbar fixed-top CookiesOK">
     <div class="content">
       <div class="nav-btn-bar">

data/_includes/templates/error.html

@@ -1,4 +1,4 @@
-<template id="_error-template">
+<template id="_error-template" hidden>
   <div class="page">
     <h1 class="page-title">{{ strings.error.title | default:"Error" }}</h1>
     {% capture link %}<a class="this-link" href=""></a>{% endcapture %}

data/_includes/{templates.html → templates/index.html}

@@ -1,6 +1,5 @@
 {% assign strings = site.data.strings %}
-<hr class="sr-only"/>
-<h2 class="sr-only">{{ strings.templates | default: "Templates"}}{{ strings.colon | default:":" }}</h2>
+<h2 class="sr-only" hidden>{{ strings.templates | default: "Templates"}}{{ strings.colon | default:":" }}</h2>
 
 {% include templates/animation.html %}
 {% include templates/loading.html %}

data/_includes/templates/loading.html

@@ -1,4 +1,4 @@
-<template id="_loading-template">
+<template id="_loading-template" hidden>
   <div class="loading">
     <span class="sr-only">{{ strings.loading | default:"Loading…" }}</span>
     <span class="icon-cog"></span>

data/_includes/templates/permalink.html

@@ -1,4 +1,4 @@
-<template id="_permalink-template">
+<template id="_permalink-template" hidden>
   <a href="#" class="permalink">
     <span class="sr-only">{{ strings.permalink | default:"Permalink" }}</span>
     <span class="{{ strings.permalink_icon | default:"icon-link" }}"></span>

data/_layouts/about.html

@@ -1,44 +1,43 @@
 ---
-# Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
+# Copyright (c) 2018 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.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 layout: base
 ---
 
-{% assign plugins = site.plugins | default:site.gems %}
-
 <article class="page" role="article">
-  {% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
-
-  {% if author.picture %}
-    {% include srcset-img.html class="avatar" img=author.picture alt=author.name %}
-  {% elsif plugins contains 'jekyll-avatar' %}
-    {% assign avatar = author.social.github | default:author.github.username | default:author.github %}
-    {% include avatar-tag.html user=avatar %}
+  {% if content contains "<!--author-->" %}
+    {% assign plugins = site.plugins | default:site.gems %}
+    {% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
+    {% capture author_x %}
+      {% if author.picture %}
+        {% include components/hy-img.html class="avatar" img=author.picture alt=author.name %}
+      {% elsif plugins contains 'jekyll-avatar' %}
+        {% assign avatar = author.social.github | default:author.github.username | default:author.github %}
+        {% include components/avatar-tag.html user=avatar %}
+      {% endif %}
+
+      {{ author.about | markdownify }}
+    {% endcapture %}
+    {% assign content = content | replace:"<!--author-->", author_x %}
   {% endif %}
 
-  <h1 class="page-title hr">{{ page.title }}</h1>
-
-  {{ author.about | markdownify }}
-
-  {% include message.html text=page.description hide=page.hide_description alt="" %}
+  <header>
+    <h1 class="page-title">{{ page.title }}</h1>
+    {% include components/message.html text=page.description hide=page.hide_description %}
+  </header>
 
   {{ content }}
 </article>

data/_layouts/base.html

@@ -1,80 +1,38 @@
 ---
-# Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
+# Copyright (c) 2018 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.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 layout: compress
 ---
 
-{% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
 {% assign plugins = site.plugins | default:site.gems %}
 
-{% if plugins contains 'jekyll-seo-tag' %}
-  {% assign color = site.accent_color | default:'#4fb1ba' %}
-  {% assign image = site.accent_image | default:'/assets/img/sidebar-bg.jpg' %}
-
-  {% if page.categories.size > 0 %}
-    {% assign category_name = page.categories.first %}
-    {% assign category = site.featured_categories | where: "slug", category_name | first %}
-    {% if category.accent_color %}{% assign color = category.accent_color %}{% endif %}
-    {% if category.accent_image %}{% assign image = category.accent_image %}{% endif %}
-  {% elsif page.tags.size > 0 %}
-    {% assign tag_name = page.tags.first %}
-    {% assign tag = site.featured_tags | where: "slug", tag_name | first %}
-    {% if tag.accent_color %}{% assign color = tag.accent_color %}{% endif %}
-    {% if tag.accent_image %}{% assign image = tag.accent_image %}{% endif %}
-  {% elsif author %}
-    {% if author.accent_color %}{% assign color = author.accent_color %}{% endif %}
-    {% if author.accent_image %}{% assign image = author.accent_image %}{% endif %}
-  {% endif %}
-
-  {% if page.accent_color %}{% assign color = page.accent_color %}{% endif %}
-  {% if page.accent_image %}{% assign image = page.accent_image %}{% endif %}
-
-{% else %}
-  {% assign color = site.accent_color | default:site.color | default:'#4fb1ba' %}
-  {% assign image = site.accent_image | default:site.image | default:'/assets/img/sidebar-bg.jpg' %}
+{% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
 
-  {% if page.categories.size > 0 %}
-    {% assign category_name = page.categories.first %}
-    {% assign category = site.featured_categories | where: "slug", category_name | first %}
-    {% if category.accent_color or category.color %}{% assign color = category.accent_color | default:category.color %}{% endif %}
-    {% if category.accent_image or category.image %}{% assign image = category.accent_image | default:category.image %}{% endif %}
-  {% elsif page.tags.size > 0 %}
-    {% assign tag_name = page.tags.first %}
-    {% assign tag = site.featured_tags | where: "slug", tag_name | first %}
-    {% if tag.accent_color %}{% assign color = tag.accent_color | default:tag.color %}{% endif %}
-    {% if tag.accent_image %}{% assign image = tag.accent_image | default:tag.image %}{% endif %}
-  {% elsif author %}
-    {% if author.accent_color or author.color %}{% assign color = author.accent_color | default:author.color %}{% endif %}
-    {% if author.accent_image or author.image %}{% assign image = author.accent_image | default:author.image %}{% endif %}
-  {% endif %}
+{% assign color       = site.accent_color | default:'#4fb1ba' %}
+{% assign theme_color = site.theme_color  | default:'#193747' %}
+{% assign image       = site.accent_image | default:'/assets/img/sidebar-bg.jpg' %}
 
-  {% if page.accent_color or page.color %}{% assign color = page.accent_color | default:page.color %}{% endif %}
-  {% if page.accent_image or page.image %}{% assign image = page.accent_image | default:page.image %}{% endif %}
-{% endif %}
+{% if page.accent_color %}{% assign color = page.accent_color %}{% endif %}
+{% if page.theme_color  %}{% assign theme_color = page.theme_color %}{% endif %}
+{% if page.accent_image %}{% assign image = page.accent_image %}{% endif %}
 
 <head>
-  {% include head.html %}
+  {% include head/index.html %}
 </head>
 
 <body>
-  {% include body.html %}
-  {% include templates.html %}
+  {% include body/index.html %}
 </body>