jekyll-theme-hydejack 7.5.2 → 8.0.0

data/_includes/{about.html → components/about.html}

@@ -3,6 +3,6 @@
 {% if author.about %}
   <aside class="about related mt4 mb4" role="complementary">
     {% assign about_heading = site.data.strings.about | default:"About" %}
-    {% include author.html author=author heading=about_heading heading_tag='h2' %}
+    {% include components/author.html author=author heading=about_heading heading_tag='h2' %}
   </aside>
 {% endif %}

data/_includes/{author.html → components/author.html}

@@ -4,10 +4,10 @@
   {% assign author = include.author %}
 
   {% if author.picture %}
-    {% include srcset-img.html class="avatar" img=author.picture alt=author.name %}
+    {% 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 avatar-tag.html user=avatar %}
+    {% include components/avatar-tag.html user=avatar %}
   {% endif %}
 
   {% assign heading_tag = include.heading_tag | default:'h2' %}
@@ -19,6 +19,6 @@
   {{ .author.about | markdownify }}
 
   <div class="sidebar-social">
-    {% include social.html author=author %}
+    {% include components/social.html author=author %}
   </div>
 </div>

data/_includes/{srcset-img.html → components/hy-img.html}

@@ -2,23 +2,39 @@
   {% assign srcset = null %}
 
   {% if include.img.srcset %}
-    {% capture srcset %}{% for hash in include.img.srcset %}{% assign tmp = hash[1] %}{% include smart-url url=tmp %} {{ hash[0] }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+    {% capture srcset %}{% for hash in include.img.srcset %}{% assign tmp = hash[1] %}{% include smart-url.txt url=tmp %} {{ hash[0] }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
   {% endif %}
 
   {% assign src = include.img.src | default:include.img.path %}
-  <img
-    src="{% include smart-url url=src %}"
+  {% capture attrs %}
+    src="{% include smart-url.txt url=src %}"
     {% if include.class %}class="{{ include.class }}"{% endif %}
     {% if include.alt %}alt="{{ include.alt }}"{% endif %}
     {% if srcset %}srcset="{{ srcset | strip }}"{% endif %}
     {% if include.sizes %}sizes="{{ include.sizes }}"{% endif %}
-    {% if include.property %}property="{{ include.property }}"{% endif %}
-  />
+  {% endcapture %}
 {% else %}
-  <img
-    src="{% include smart-url url=include.img %}"
+  {% capture attrs %}
+    src="{% include smart-url.txt url=include.img %}"
     {% if include.class %}class="{{ include.class }}"{% endif %}
     {% if include.alt %}alt="{{ include.alt }}"{% endif %}
+  {% endcapture %}
+{% endif %}
+
+{% unless site.hydejack.no_img %}
+  <hy-img
+    {{ attrs }}
+    {% if include.property %}property="{{ include.property }}"{% endif %}
+    root-margin="512px"
+  >
+    <noscript><img re-ignore {{ attrs }}/></noscript>
+    <span class="loading" slot="loading" hidden>
+      <span class="icon-cog"></span>
+    </span>
+  </hy-img>
+{% else %}
+  <img 
+    {{ attrs }}
     {% if include.property %}property="{{ include.property }}"{% endif %}
   />
-{% endif %}
+{% endunless %}

data/_includes/{pagination.html → components/pagination.html}

@@ -4,12 +4,12 @@
     <li class="pagination-item older" >
       {% assign next_title = site.data.strings.older | default:"Older" %}
       {% assign next_href = paginator.next_page_path | relative_url %}
-      {% include link.html rel="next" title=next_title href=next_href %}
+      {% include components/link.html rel="next" title=next_title href=next_href %}
     </li>
     <li class="pagination-item newer" >
       {% assign prev_title = site.data.strings.newer | default:"Newer" %}
       {% assign prev_href = paginator.previous_page_path | relative_url %}
-      {% include link.html rel="prev" title=prev_title href=prev_href %}
+      {% include components/link.html rel="prev" title=prev_title href=prev_href %}
     </li>
   </ul>
 </nav>

data/_includes/{post.html → components/post.html}

@@ -1,12 +1,14 @@
-{% assign post = include.post %}
-{% assign link_title = include.link_title %}
+{% assign post          = include.post          %}
+{% assign no_link_title = include.no_link_title %}
+{% assign no_excerpt    = include.no_excerpt    %}
+{% assign hide_image    = include.hide_image    %}
 
-<article id="post{{ post.id | replace:'/','-' }}" class="page post{% if link_title %} mb6{% endif %}" role="article">
+<article id="post{{ post.id | replace:'/','-' }}" class="page post mb6" role="article">
   <header>
     <h1 class="post-title">
-      {% if link_title %}<a href="{{ post.url | relative_url }}" class="flip-title">{% endif %}
+      {% unless no_link_title %}<a href="{{ post.url | relative_url }}" class="flip-title">{% endunless %}
         {{ post.title }}
-      {% if link_title %}</a>{% endif %}
+      {% unless no_link_title %}</a>{% endunless %}
     </h1>
 
     <p class="post-date heading">
@@ -16,17 +18,26 @@
       {% assign tag_start          = site.data.strings.tag_start          | default:"on " %}
       {% assign category_separator = site.data.strings.category_separator | default:" / " %}
       {% assign tag_separator      = site.data.strings.tag_separator      | default:", "  %}
-      {% include tag-list.html tags=post.categories meta=site.featured_categories start_with=category_start separator=category_separator %}
-      {% include tag-list.html tags=post.tags meta=site.featured_tags start_with=tag_start separator=tag_separator %}
+      {% 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>
 
-    {% include message.html text=post.description hide=page.hide_description %}
+    {% 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>
+      {% assign alt = '' %}
+    {% endif %}{% endunless %}
+
+    {% include components/message.html text=post.description hide=page.hide_description alt=alt %}
   </header>
 
-  {% unless include.excerpt %}
+  {% if no_excerpt %}
     {{ post.content }}
   {% else %}
     {{ post.excerpt }}
+
     {% capture post_title %}<a class="heading flip-title" href="{{ post.url | relative_url }}">{{ post.title }}</a>{% endcapture %}
     {% assign text = site.data.strings.continue_reading | default:"Continue reading <!--post_title-->" %}
     <footer>
@@ -34,5 +45,5 @@
         {{ text | replace:"<!--post_title-->", post_title }}
       </p>
     </footer>
-  {% endunless %}
+  {% endif %}
 </article>

data/_includes/{related-posts.html → components/related-posts.html}

@@ -16,7 +16,7 @@
 
   <ul class="related-posts">
     {% for post in related_posts limit:3 %}
-      {% include post-list-item.html post=post %}
+      {% include components/post-list-item.html post=post %}
     {% endfor %}
   </ul>
 </aside>

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

@@ -0,0 +1,40 @@
+{% assign platform = include.platform | downcase %}
+{% assign username = include.username %}
+
+{% if username.size > 0 %}
+  {% assign = data_social = site.data.social[platform] | default:site.data_social[platform] %}
+
+  {% assign name = data_social.name | default:include.platform %}
+  {% assign icon = data_social.icon | default:'icon-link' %}
+  {% assign app = data_social.append %}
+  {% assign prep = data_social.prepend %}
+
+  {% unless data_social %}
+    {% if platform == "email" %}
+      {% assign name = "Email" %}
+      {% assign icon = "icon-mail" %}
+      {% assign prep = "mailto:" %}
+    {% elsif platform == "twitter" %}
+      {% assign name = "Twitter" %}
+      {% assign icon = "icon-twitter" %}
+      {% assign prep = "https://twitter.com/" %}
+    {% elsif platform == "github" %}
+      {% assign name = "GitHub" %}
+      {% assign icon = "icon-github" %}
+      {% assign prep = "https://github.com/" %}
+    {% endif %}
+  {% endunless %}
+
+  {% if username contains "//" or username contains "mailto:" %}
+    {% assign url = username %}
+  {% else %}
+    {% assign url = username | prepend:prep | append:app %}
+  {% endif %}
+
+  <li>
+    <a href="{{ url }}" title="{{ name }}" class="no-mark-external">
+      <span class="{{ icon }}"></span>
+      <span class="sr-only">{{ name }}</span>
+    </a>
+  </li>
+{% endif %}

data/_includes/components/social.html

@@ -0,0 +1,23 @@
+<span class="sr-only">{{ site.data.strings.social | default:"Social" }}{{ site.data.strings.colon }}</span>
+<ul>
+  {% if include.author.social %}
+    {% for link in include.author.social %}
+      {% include components/social-list-item.html platform=link.first username=link.last %}
+    {% endfor %}
+  {% else %}
+    {% assign twitter_username = author.twitter.username | default: author.twitter | default:site.twitter.username | default:site.twitter | default:site.twitter_username %}
+    {% if twitter_username %}
+      {% include components/social-list-item.html platform="twitter" username=twitter_username %}
+    {% endif %}
+
+    {% assign github_username = author.github.username | default: author.github | default:site.github.username | default:site.github | default:site.github_username %}
+    {% if github_username %}
+      {% include components/social-list-item.html platform="github" username=github_username %}
+    {% endif %}
+
+    {% assign email = author.email | default: site.email %}
+    {% if email %}
+      {% include components/social-list-item.html platform="email" username=email %}
+    {% endif %}
+  {% endif %}
+</ul>

data/_includes/head/index.html

@@ -0,0 +1,9 @@
+{% 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 %}
+{% include my-head.html %}

data/_includes/head/links.html

@@ -18,12 +18,14 @@
 
 {% assign disqus = site.disqus | default:site.disqus_shortname %}
 {% if disqus %}
-<link id="_disqusJS" rel="dns-prefetch" href="https://{{ disqus }}.disqus.com/embed.js">
+<link rel="dns-prefetch" href="https://{{ disqus }}.disqus.com" id="_hrefDisqus">
 {% endif %}
 
 {% comment %}<!--
-The links below are here so that we can use their `href` in JS (see `_js/src/katex.js`).
-This way, CDN optimizers or other tools can modify the URL and we avoid hard-coding it in JavaScript.
+  This is to avoid hard-coding URLs in JS (where they can't be discovered by automated tools).
 -->{% endcomment %}
-<link id="_katexJS"  rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/katex.min.js'  | relative_url }}">
-<link id="_katexCSS" rel="dns-prefetch" href="{{ '/assets/bower_components/katex/dist/katex.min.css' | relative_url }}">
+<link href="{{ '/assets/js/hydejack-8.0.0.js'                                     | relative_url }}" id="_hrefJS">
+<link href="{{ '/assets/bower_components/fontfaceobserver/fontfaceobserver.standalone.js'| relative_url }}" id="_hrefFFO">
+<link href="{{ '/assets/bower_components/katex/dist/katex.min.js'                        | relative_url }}" id="_hrefKatexJS">
+<link href="{{ '/assets/bower_components/katex/dist/katex.min.css'                       | relative_url }}" id="_hrefKatexCSS">
+<link href="{{ '/assets/img/swipe.svg'                                                   | relative_url }}" id="_hrefSwipeSVG">

data/_includes/head/meta.html

@@ -6,7 +6,7 @@
   {% if plugins contains 'jekyll-seo-tag' %}{% include head/seo-tag.html %}
   {% else %}{% include head/seo-fallback.html %}{% endif %}
 
-  {% if site.keywords or page.keywords %}
+  {% if site.keywords.size > 0 or page.keywords.size > 0 %}
     <meta name="keywords" content="{{ page.keywords | default:site.keywords | join:',' }}">
   {% endif %}
 {% else %}
@@ -24,7 +24,7 @@
 <meta name="msapplication-config" content="{{ '/assets/ieconfig.xml' | relative_url }}">
 
 {% unless site.hydejack.no_theme_color %}
-<meta name="theme-color" content="{{ page.theme_color | default:color | default:'#4fb1ba' }}">
+<meta name="theme-color" content="{{ theme_color | default:'#193747' }}">
 {% endunless %}
 
-<meta name="generator" content="Hydejack v7.5.2">
+<meta name="generator" content="Hydejack v8.0.0" />

data/_includes/{page-style.html → head/page-style.html}

@@ -22,7 +22,7 @@
     border-color: {{ color }};
   }
 
-  .btn-primary:focus, .btn-primary.focus {
+  .btn-primary:focus, .btn-primary.focus, .form-control:focus, .form-control.focus {
     box-shadow: 0 0 0 3px rgba({{ color }}, .5);
   }
 

data/_includes/head/scripts.html

@@ -1,44 +1,15 @@
 <script>
-  {% include scripts/load-js-deferred.min.js %}{% include scripts/loadCSS.min.js %}{% include scripts/cssrelpreload.min.js %}
+  {% include scripts/load-js.min.js %}{% include scripts/loadCSS.min.js %}{% include scripts/cssrelpreload.min.js %}
   window._noPushState = {{ site.hydejack.no_push_state | default:site.disable_push_state | default:false }};
   window._noDrawer = {{ site.hydejack.no_drawer | default:site.disable_drawer | default:false }};
-</script>
-
-<!--[if gt IE 8]><!---->
-{% assign google_fonts = site.google_fonts | default:"Roboto+Slab:700|Noto+Sans:400,400i,700,700i" %}
-{% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
-<script>
-  WebFontConfig = {
-    {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
-    google: {
-      families: ['{{ google_fonts | split:"|" | join:"','" }}']
-    },
-    {% endunless %}
-
-    custom: {
-      families: ['icomoon'],
-      urls: ['{{ icons_url | relative_url }}']
-    }
-  };
-  (function(d) {
-    var wf = d.createElement('script'), s = d.scripts[0];
-    wf.src = "{{ '/assets/bower_components/webfontloader/webfontloader.js' | relative_url }}";
-    s.parentNode.insertBefore(wf, s);
-  }(document));
-</script>
-<!--<![endif]-->
-
-<noscript>
-  {% assign font_heading = site.font_heading | default:"'Roboto Slab', Helvetica, Arial, sans-serif" %}
-  {% assign font         = site.font         | default:"'Noto Sans', Helvetica, Arial, sans-serif" %}
-
   {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ google_fonts | uri_escape }}">
-    <style>
-      html { font-family: {{ font }} }
-      h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading }} }
-    </style>
+    !function(w, d) {
+      loadJS(document.getElementById('_hrefFFO').href, function() {
+        if ('Promise' in w) Promise.all([
+          new FontFaceObserver('{{ font | split:',' | first }}').load(),
+          new FontFaceObserver('{{ font_heading | split:',' | first }}').load(),
+        ]).then(function f() { d.body.className += ' font-active'; }, function() {});
+      });
+    }(window, document);
   {% endunless %}
-
-  <link rel="stylesheet" href="{{ icons_url | relative_url }}">
-</noscript>
+</script>

data/_includes/head/styles.html

@@ -1,24 +1,51 @@
 <!--[if gt IE 8]><!---->
-{% capture style_url %}{% link assets/css/hydejack-7.5.2.css %}{% endcapture %}
+{% capture style_url %}{% link assets/css/hydejack-8.0.0.css %}{% endcapture %}
+{% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
+{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts }}{% 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" %}
 
 {% 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 site.hydejack.no_google_fonts or site.no_google_fonts %}
+    <link rel="stylesheet" href="{{ fonts_url }}">
+    <noscript>
+      <style>
+        html { font-family: {{ font }}!important; }
+        h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading }}!important; }
+      </style>
+    </noscript>
+  {% endunless %}
 {% else %}
   <style>
-    {% capture include_to_scssify %}{% include styles/inline.scss %}{% endcapture %}
-    {{ include_to_scssify | scssify }}
-    {% if page.layout == "projects" or page.layout == "project" or page.layout == "welcome" %}
-      {% capture include_to_scssify %}{% include styles/pro/projects.scss %}{% endcapture %}
-      {{ include_to_scssify | scssify }}
-    {% elsif page.layout == "resume" %}
-      {% capture include_to_scssify %}{% include styles/pro/resume.scss %}{% endcapture %}
-      {{ include_to_scssify | scssify }}
-    {% endif %}
+    {% capture to_scssify %}{% include styles/inline.scss %}{% endcapture %}
+    {{ to_scssify | scssify }}
   </style>
-  <link id="_stylePreload" rel="preload" as="style" href="{{ style_url | relative_url }}">
-  <script>window.setRelStylesheet('_stylePreload');</script>
-  <noscript><link rel="stylesheet" href="{{ style_url | relative_url }}"></noscript>
-{% endif %}
 
-{% include page-style.html %}
+  <link rel="preload" as="style" href="{{ style_url | relative_url }}" id="_stylePreload">
+  <script>setRel('_stylePreload');</script>
+
+  <link rel="preload" as="style" href="{{ icons_url | relative_url }}" id="_iconsPreload">
+  <script>setRel('_iconsPreload');</script>
+
+  {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
+    <link rel="preload" as="style" href="{{ fonts_url }}" id="_fontsPreload">
+    <script>setRel('_fontsPreload');</script>
+  {% endunless %}
+
+  <noscript>
+    <link rel="stylesheet" href="{{ style_url | relative_url }}">
+    <link rel="stylesheet" href="{{ icons_url | relative_url }}">
+    {% unless site.hydejack.no_google_fonts or site.no_google_fonts %}
+      <link rel="stylesheet" href="{{ fonts_url }}">
+      <style>
+        html { font-family: {{ font }}!important; }
+        h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading }}!important; }
+      </style>
+    {% endunless %}
+  </noscript>
+{% endif %}
+{% include head/page-style.html %}
 <!--<![endif]-->

data/_includes/header.txt

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

data/_includes/my-body.html

@@ -0,0 +1,42 @@
+{% comment %}
+<!--
+Example code for using Matamo as alternative analytics solution.
+-->
+{% if site.matomo_analytics %}
+<script>
+  var _paq = _paq || [];
+
+  {% if site.matomo_analytics.no_cookies %}
+  _paq.push(['disableCookies']);
+  {% endif %}
+
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  _paq.push(['setTrackerUrl', u+'piwik.php']);
+  _paq.push(['setSiteId', '{{site.matomo_analytics.site_id}}']);
+
+  var pushStateEl = document.getElementsByTagName('hy-push-state')[0];
+  var timeStartLoadPage, referer, timeItTookToLoadPage;
+
+  pushStateEl.addEventListener('hy-push-state-start', function() {
+    timeStartLoadPage = new Date().getTime();
+    referer = window.location.toString();
+  });
+
+  pushStateEl.addEventListener('hy-push-state-ready', function() {
+    timeItTookToLoadPage = new Date().getTime() - timeStartLoadPage;
+  });
+
+  pushStateEl.addEventListener('hy-push-state-after', function() {
+    _paq.push(['setReferrerUrl', referer]);
+    _paq.push(['setCustomUrl', window.location.toString()]);
+    _paq.push(['setDocumentTitle', document.title]);
+    _paq.push(['deleteCustomVariables', 'page']);
+    _paq.push(['setGenerationTimeMs', timeItTookToLoadPage]);
+    _paq.push(['trackPageView']);
+  });
+
+  window.loadJSDeferred('{{site.matomo_analytics.root}}piwik.js');
+</script>
+{% endif %}
+{% endcomment %}