jekyll-theme-hydejack 6.6.1 → 7.0.0.pre.beta.0

data/_includes/head/seo-fallback.html

@@ -0,0 +1,13 @@
+{% assign strings = site.data.strings %}
+{% capture title %}
+  {% if page.url == "/" %}
+    {{ site.title }}{% if site.tagline %} {{ strings.separator }} {{ site.tagline }}{% endif %}
+  {% elsif page.title.size > 0 %}
+    {{ page.title }} {{ strings.separator }} {{ site.title }}
+  {% else %}
+    {{ site.title }}
+  {% endif %}
+{% endcapture %}
+<title>{{ title | strip }}</title>
+<meta name="description" content="{{ page.description | default:page.excerpt | default:site.description | markdownify | strip_html }}">
+<link rel="canonical" href="{{ page.url | absolute_url }}">

data/_includes/head/seo-tag.html

@@ -0,0 +1,4 @@
+{% comment %}<!--
+Including `seo` in a partial prevents a parse error when `jekyll-seo-tag` is not included
+-->{% endcomment %}
+{% seo %}

data/_includes/head/styles.html

@@ -0,0 +1,24 @@
+<!--[if gt IE 8]><!---->
+{% capture style_url %}{% link assets/css/hydejack.css %}?v=7.0.0-beta.0{% endcapture %}
+
+{% if site.hydejack.no_inline_css or jekyll.environment == 'development' %}
+  <link rel="stylesheet" href="{{ style_url | relative_url }}">
+{% 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 %}
+  </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 %}
+<!--<![endif]-->

data/_includes/header.txt

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

data/_includes/link.html

@@ -1,5 +1,12 @@
 {% if include.href.size > 0 %}
-  <a href="{{ include.href }}">{{ include.title }}</a>
+  <a
+    class="{{ include.class }} {{ include.a_class }}"
+    href="{{ include.href }}"
+    {% if include.rel %}rel="{{ include.rel }}"{% endif %}
+    {% if include.property %}property="{{ include.property }}"{% endif %}
+  >
+    {{ include.title }}
+  </a>
 {% else %}
-  <span>{{ include.title }}</span>
+  <span class="{{ include.class }} {{ include.span_class }}">{{ include.title }}</span>
 {% endif %}

data/_includes/message.html

@@ -1,9 +1,14 @@
-{% if include.text %}
-  {% capture desc %}
-{{ include.text | strip_newlines }}
-{:.message}
-  {% endcapture %}
-  {{ desc | markdownify }}
+{% assign alt = include.alt %}
+{% unless alt %}{% capture alt %}<div class="hr pb0"></div>{% endcapture %}{% endunless %}
+
+{% if include.text.size > 0 %}
+  {% unless include.hide %}
+    <p class="message" {% if include.property %}property="{{ include.property }}"{% endif %}>
+      {{ include.text | markdownify | replace:"<p>","" | replace:"</p>","" }}
+    </p>
+  {% else %}
+    {{ alt }}
+  {% endunless %}
 {% else %}
-  <div class="hr" style="padding-bottom:0"></div>
+  {{ alt }}
 {% endif %}

data/_includes/my-scripts.html

@@ -1,7 +1,16 @@
-{% comment %}
 <script>
-  document.getElementById('_yPushState').addEventListener('y-push-state-load', function() {
-    // <your init code>
-  });
+  function detectCFScript() {
+    var cfScript = Array.prototype.find.call(document.scripts, function(s) {
+      return s !== document.currentScript && s.textContent.indexOf('__cf_email__') > -1;
+    });
+
+    if (cfScript)
+      this.addEventListener('hy-push-state-load', new Function(cfScript.textContent));
+
+    this.removeEventListener('hy-push-state-init', detectCFScript);
+  }
+
+  document
+    .getElementsByTagName('hy-push-state')[0]
+    .addEventListener('hy-push-state-init', detectCFScript);
 </script>
-{% endcomment %}

data/_includes/nav.html

@@ -1,16 +1,23 @@
-<span class="sr-only">Navigation:</span>
+<span class="sr-only">{{ site.data.strings.navigation | default:"Navigation" }}{{ site.data.strings.colon }}</span>
 <ul>
-  {% assign pages = site.pages %}
-
-  {% for document in site.documents %}
-    {% assign pages = pages | push: document %}
-  {% endfor %}
-
-  {% assign pages = pages | where: "menu", true | sort: "order" %}
-
-  {% for node in pages %}
-    <li>
-      <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url | relative_url }}">{{ node.title }}</a>
-    </li>
+  {% assign pages = site.pages | where: "menu", true %}
+  {% assign documents = site.documents | where: "menu", true %}
+  {% assign nodes = pages | concat: documents | sort: "order" %}
+  {% for node in nodes %}
+    {% unless node.redirect_to %}
+      <li>
+        <a
+          href="{{ node.url | relative_url }}"
+          class="sidebar-nav-item{% if page.url contains node.url %} active{% endif %}"
+          {% if path.rel %}rel="{{ node.rel }}"{% endif %}
+          >
+          {{ node.title }}
+        </a>
+      </li>
+    {% else %}
+      <li>
+        <a href="{{ node.redirect_to }}" class="sidebar-nav-item" >{{ node.title }}</a>
+      </li>
+    {% endunless %}
   {% endfor %}
 </ul>

data/_includes/page-style.html

@@ -1,12 +1,14 @@
-<!-- NOTE: These styles interact with JavsScript, so they MUST NOT be changed -->
+{% comment %}<!--
+  These styles interact with JavsScript. Their ordering MUST NOT be changed. See `_js/cross-fader.js`.
+-->{% endcomment %}
 <style id="_pageStyle">
 {% capture page_style %}
-  .content a {
+  .content a:not(.btn) {
     color: {{ color }};
     border-color: fade-out({{ color }}, 0.8);
   }
 
-  .content a:hover {
+  .content a:not(.btn):hover {
     border-color: {{ color }};
   }
 
@@ -14,6 +16,34 @@
     outline-color: {{ color }};
   }
 
+  .btn-primary {
+    color: #fff;
+    background-color: {{ color }};
+    border-color: {{ color }};
+  }
+
+  .btn-primary:focus, .btn-primary.focus {
+    box-shadow: 0 0 0 3px rgba({{ color }}, .5);
+  }
+
+  .btn-primary:hover, .btn-primary.hover {
+    color: #fff;
+    background-color: darken({{ color }}, 7.5%);
+    border-color: darken({{ color }}, 7.5%);
+  }
+
+  .btn-primary:disabled, .btn-primary.disabled {
+    color: #fff;
+    background-color: {{ color }};
+    border-color: {{ color }};
+  }
+
+  .btn-primary:active, .btn-primary.active {
+    color: #fff;
+    background-color: darken({{ color }}, 7.5%);
+    border-color: darken({{ color }}, 7.5%);
+  }
+
   ::selection {
     color: #fff;
     background: {{ color }};

data/_includes/pagination.html

@@ -1,19 +1,15 @@
-<h2 class="sr-only">Pagination</h2>
-<nav class="pagination heading" role="navigation">
+<h2 class="sr-only">{{ site.data.strings.pagination | default:"Pagination" }}</h2>
+<nav class="pagination heading clearfix" role="navigation">
   <ul>
     <li class="pagination-item older" >
-      {% if paginator.next_page %}
-        <a rel="next" href="{{ paginator.next_page_path | relative_url }}">Older</a>
-      {% else %}
-        <span>Older</span>
-      {% endif %}
+      {% 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 %}
     </li>
     <li class="pagination-item newer" >
-      {% if paginator.previous_page %}
-        <a rel="prev" href="{{ paginator.previous_page_path | relative_url }}">Newer</a>
-      {% else %}
-        <span>Newer</span>
-      {% endif %}
+      {% 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 %}
     </li>
   </ul>
 </nav>

data/_includes/post-list-item.html

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

data/_includes/post.html

@@ -1,31 +1,38 @@
 {% assign post = include.post %}
+{% assign link_title = include.link_title %}
 
-<article id="post-{{ post.id | slice: 1,9999 }}" class="post{% if include.link_title %} mb6{% endif %}" role="article">
+<article id="post{{ post.id | replace:'/','-' }}" class="page post{% if link_title %} mb6{% endif %}" role="article">
   <header>
     <h1 class="post-title">
-      {% if include.link_title %}<a href="{{ post.url | relative_url }}" data-flip="title">{% endif %}
+      {% if link_title %}<a href="{{ post.url | relative_url }}" class="flip-title">{% endif %}
         {{ post.title }}
-      {% if include.link_title %}</a>{% endif %}
+      {% if link_title %}</a>{% endif %}
     </h1>
 
     <p class="post-date heading">
-      <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: "%d %b %Y" }}</time>
-      {% include tag-list.html tags=post.categories meta=site.featured_categories start_with="in " separator=" / " %}
-      {% include tag-list.html tags=post.tags meta=site.featured_tags start_with="on " separator=", " %}
+      {% 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 " %}
+      {% 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 %}
     </p>
 
-    {% include message.html text=post.description %}
+    {% include message.html text=post.description hide=page.no_description %}
   </header>
 
   {% unless include.excerpt %}
     {{ post.content }}
   {% else %}
     {{ post.excerpt }}
-    <p class="read-more">Continue reading <a class="heading" href="{{ post.url | relative_url }}" data-flip="title">{{ post.title }}</a></p>
+    {% 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>
+      <p class="read-more">
+        {{ text | replace:"<!--post_title-->", post_title }}
+      </p>
+    </footer>
   {% endunless %}
-
 </article>
-
-{% unless include.link_title %}
-  <hr class="dingbat" />
-{% endunless %}

data/_includes/related-posts.html

@@ -0,0 +1,23 @@
+{% assign post = include.post %}
+
+{% if site.hydejack.use_lsi or site.use_lsi %}
+  {% assign related_posts = site.related_posts %}
+{% elsif post.categories.first %}
+  {% assign related_posts = site.categories[post.categories.first] | where_exp:"post", "post.url != page.url" %}
+{% elsif post.tags.first %}
+  {% assign related_posts = site.tags[post.tags.first] | where_exp:"post", "post.url != page.url" %}
+{% else %}
+  {% assign related_posts = site.related_posts %}
+{% endif %}
+
+{% if related_posts.size > 0 %}
+<aside class="related mb4" role="complementary">
+  <h2 class="hr">{{ site.data.strings.related_posts | default:"Related Posts" }}</h2>
+
+  <ul class="related-posts">
+    {% for post in related_posts limit:3 %}
+      {% include post-list-item.html post=post %}
+    {% endfor %}
+  </ul>
+</aside>
+{% endif %}

data/_includes/scripts/load-disqus.js

@@ -30,11 +30,10 @@
   if (!w._disqusLoading) {
     w._disqusLoading = true;
 
-    loadJSDeferred('//{{ site.disqus_shortname }}.disqus.com/embed.js');
+    loadJSDeferred('//{{ include.disqus }}.disqus.com/embed.js');
 
     // add event listener
     if (w.addEventListener) w.addEventListener('scroll', loadDQ, { passive: true });
-    else if (w.attachEvent) w.attachEvent('onscroll', loadDQ);
     else w.onscroll = loadDQ;
   } else {
     w._disqusFirst = false;

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

@@ -1 +1 @@
-!function(s,i){function e(e){var t=s.pageYOffset||i.body.scrollTop;s.DISQUS&&!s._disqusThis&&!s._disqusFirst&&t+s.innerHeight>=s._disqusThreadOffsetTop&&(s._disqusThis=!0,s.DISQUS.reset({reload:!0,config:d}))}var d=function(){this.page.title="{{ page.title }}",this.page.identifier="{{ page.id }}",this.page.url="{{ page.url | absolute_url }}"};s._disqusFirst=void 0===s._disqusFirst||s._disqusFirst,s._disqusLoading=void 0!==s._disqusLoading&&s._disqusLoading,s._disqusThis=!1,s._disqusThreadOffsetTop=i.getElementById("disqus_thread").offsetTop,s._disqusLoading?s._disqusFirst=!1:(s._disqusLoading=!0,loadJSDeferred("//{{ site.disqus_shortname }}.disqus.com/embed.js"),s.addEventListener?s.addEventListener("scroll",e,{passive:!0}):s.attachEvent?s.attachEvent("onscroll",e):s.onscroll=e)}(window,document);
+!function(s,i){function d(d){var t=s.pageYOffset||i.body.scrollTop;s.DISQUS&&!s._disqusThis&&!s._disqusFirst&&t+s.innerHeight>=s._disqusThreadOffsetTop&&(s._disqusThis=!0,s.DISQUS.reset({reload:!0,config:e}))}var e=function(){this.page.title="{{ page.title }}",this.page.identifier="{{ page.id }}",this.page.url="{{ page.url | absolute_url }}"};s._disqusFirst=void 0===s._disqusFirst||s._disqusFirst,s._disqusLoading=void 0!==s._disqusLoading&&s._disqusLoading,s._disqusThis=!1,s._disqusThreadOffsetTop=i.getElementById("disqus_thread").offsetTop,s._disqusLoading?s._disqusFirst=!1:(s._disqusLoading=!0,loadJSDeferred("//{{ include.disqus }}.disqus.com/embed.js"),s.addEventListener?s.addEventListener("scroll",d,{passive:!0}):s.onscroll=d)}(window,document);

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

@@ -1,49 +1,53 @@
 // Compress via uglify:
 // uglifyjs load-js-deferred.js -c -m > load-js-deferred.min.js
-(function(w, d) {
-  function stdOnEnd(script, cb) {
-    script.onload = function () {
-      this.onerror = this.onload = null;
-      cb(null, script);
-    };
-
-    script.onerror = function () {
-      this.onerror = this.onload = null;
-      cb(new Error('Failed to load ' + this.src), script);
-    };
-  }
-
-  function ieOnEnd(script, cb) {
-    script.onreadystatechange = function () {
-      if (this.readyState != 'complete' && this.readyState != 'loaded') return;
-      this.onreadystatechange = null;
-      cb(null, script);
-    };
-  }
-
-  w._loaded = false;
-  w.loadJSDeferred = function(src, cb) {
-    function loadJS() {
-      w._loaded = true;
-
-      var script = d.createElement('script');
-      script.src = src;
-
-      if (cb) {
-        ('onload' in script ? stdOnEnd : ieOnEnd)(script, cb);
-
-        if (!script.onload) {
-          stdOnEnd(script, cb);
-        }
+function stdOnEnd(script, cb) {
+  script.onload = function () {
+    this.onerror = this.onload = null;
+    cb(null, script);
+  };
+
+  script.onerror = function () {
+    this.onerror = this.onload = null;
+    cb(new Error('Failed to load ' + this.src), script);
+  };
+}
+
+function ieOnEnd(script, cb) {
+  script.onreadystatechange = function () {
+    if (this.readyState != 'complete' && this.readyState != 'loaded') return;
+    this.onreadystatechange = null;
+    cb(null, script);
+  };
+}
+
+window.setRelStylesheet = function (id) {
+  var link = document.getElementById(id);
+  function set() { this.rel = 'stylesheet'; }
+  if (link.addEventListener) link.addEventListener('load', set, false);
+  else link.onload = set;
+};
+
+window._loaded = false;
+window.loadJSDeferred = function(src, cb) {
+  function loadJS() {
+    window._loaded = true;
+
+    var script = document.createElement('script');
+    script.src = src;
+
+    if (cb) {
+      ('onload' in script ? stdOnEnd : ieOnEnd)(script, cb);
+
+      if (!script.onload) {
+        stdOnEnd(script, cb);
       }
-
-      var ref = d.getElementsByTagName('script')[0];
-      ref.parentNode.insertBefore(script, ref);
     }
 
-    if (w._loaded) loadJS();
-    else if (w.addEventListener) w.addEventListener('load', loadJS, false);
-    else if (w.attachEvent) w.attachEvent('onload', loadJS);
-    else w.onload = loadJS;
+    var ref = document.scripts[0];
+    ref.parentNode.insertBefore(script, ref);
   }
-}(window, document));
+
+  if (window._loaded) loadJS();
+  else if (window.addEventListener) window.addEventListener('load', loadJS, false);
+  else window.onload = loadJS;
+};

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

@@ -1 +1 @@
-!function(n,e){function t(n,e){n.onload=function(){this.onerror=this.onload=null,e(null,n)},n.onerror=function(){this.onerror=this.onload=null,e(new Error("Failed to load "+this.src),n)}}function o(n,e){n.onreadystatechange=function(){"complete"!=this.readyState&&"loaded"!=this.readyState||(this.onreadystatechange=null,e(null,n))}}n._loaded=!1,n.loadJSDeferred=function(a,d){function r(){n._loaded=!0;var r=e.createElement("script");r.src=a,d&&(("onload"in r?t:o)(r,d),r.onload||t(r,d));var l=e.getElementsByTagName("script")[0];l.parentNode.insertBefore(r,l)}n._loaded?r():n.addEventListener?n.addEventListener("load",r,!1):n.attachEvent?n.attachEvent("onload",r):n.onload=r}}(window,document);
+function stdOnEnd(n,e){n.onload=function(){this.onerror=this.onload=null,e(null,n)},n.onerror=function(){this.onerror=this.onload=null,e(new Error("Failed to load "+this.src),n)}}function ieOnEnd(n,e){n.onreadystatechange=function(){"complete"!=this.readyState&&"loaded"!=this.readyState||(this.onreadystatechange=null,e(null,n))}}window.setRelStylesheet=function(n){function e(){this.rel="stylesheet"}var o=document.getElementById(n);o.addEventListener?o.addEventListener("load",e,!1):o.onload=e},window._loaded=!1,window.loadJSDeferred=function(n,e){function o(){window._loaded=!0;var o=document.createElement("script");o.src=n,e&&(("onload"in o?stdOnEnd:ieOnEnd)(o,e),o.onload||stdOnEnd(o,e));var t=document.scripts[0];t.parentNode.insertBefore(o,t)}window._loaded?o():window.addEventListener?window.addEventListener("load",o,!1):window.onload=o};

data/_includes/sidebar.html

@@ -1,10 +1,23 @@
-<div id="_yDrawer">
-  <div id="_sidebar" class="sidebar">
-    <div class="sidebar-bg" style="background-color:{{ color }};background-image:url({{ image }})"></div>
-    <header class="sidebar-sticky" role="banner">
+<hy-drawer>
+  <header id="_sidebar" class="sidebar" role="banner">
+    {% if image.background %}
+      {% capture bg_style %}background:{{ image.background }}{% endcapture %}
+      {% capture bg_class %}sidebar-bg {% if image.overlay %}sidebar-overlay{% endif %}{% endcapture %}
+    {% else %}
+      {% capture bg_style %}background-color:{{ color }};{% if image != 'none' %}background-image:url({{ image }}){% endif %}{% endcapture %}
+      {% capture bg_class %}sidebar-bg {% if image != 'none' %}sidebar-overlay{% endif %}{% endcapture %}
+    {% endif %}
+    <div class="{{ bg_class }}" style="{{ bg_style }}"></div>
+
+    <div class="sidebar-sticky">
       <div class="sidebar-about">
-        <h1><a id="_title" href="{{ '/' | relative_url }}">{{ site.title }}</a></h1>
-        {{ site.description | truncatewords:50 | markdownify }}
+        <h2 class="h1"><a id="_title" href="{{ '/' | relative_url }}">{{ site.title }}</a></h2>
+        {% assign text = site.tagline | default:site.description %}
+        {% if text %}
+          <p class="{% if text.size > 100 %}fine{% endif %}">
+            {{ text | markdownify | replace:'<p>','' | replace:'</p>','' }}
+          </p>
+        {% endif %}
       </div>
 
       <nav class="sidebar-nav heading" role="navigation">
@@ -13,11 +26,9 @@
 
       {% assign author = site.data.authors.first[1] | default:site.author %}
 
-      {% if author.social or site.github_username or site.twitter_username %}
-        <div class="sidebar-social">
-          {% include social.html social=author.social %}
-        </div>
-      {% endif %}
-    </header>
-  </div>
-</div>
+      <div class="sidebar-social">
+        {% include social.html author=author %}
+      </div>
+    </div>
+  </header>
+</hy-drawer>