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

data/README.md

@@ -57,16 +57,23 @@ A [portfolio], a [resume] layout and a [welcome] page to feature your favorite p
 
 This table details what is and isn't included in each respective version.
 
-| Version                          | Free               | PRO                |
-|:---------------------------------|:------------------:|:------------------:|
-| Blog                             | ✔           | ✔           |
-| Features (see below)             | ✔           | ✔           |
-| [Portfolio] Layout               |                    | ✔           |
-| [Resume] Layout                  |                    | ✔           |
-| [Welcome] Layout                 |                    | ✔           |
-| License                          | [MIT][license]     | [PRO]              |
-| Price                            | Free               | $34                |
-| | [**Download on GitHub**][download]<br/> – or – <br/>[**Use the RubyGem**][gem] | [**Buy Now – $34**][buy] [^3] |
+|                                     | Free               | PRO                |
+|:------------------------------------|:------------------:|:------------------:|
+| Blog                                | &#x2714;           | &#x2714;           |
+| Features (see below)                | &#x2714;           | &#x2714;           |
+| [Portfolio] Layout                  |                    | &#x2714;           |
+| [Resume] Layout                     |                    | &#x2714;           |
+| [Welcome] Layout                    |                    | &#x2714;           |
+| Newsletter Subscription Box         |                    | &#x2714;           |
+| Form Element Styles                 |                    | &#x2714;           |
+| Search Functionality                |                    | &#x2714;           |
+| Offline Support[^4]                 |                    | &#x2714;           |
+| Latest issue of "Fishing Quarterly" |                    |                    |
+| Three months supply of cat food     |                    |                    |
+| 10 free scuba diving coupons        |                    |                    |
+| License                             | [GPL-3.0][license] | [PRO]              |
+| Price                               | Free               | $59                |
+|| [**Download on GitHub**][github]<br/> -- or -- <br/>[**Use the RubyGem**][gem] | [Buy Now – $59][buy] [^3] |
 
 
 [^1]: Applies after the initial page load.  
@@ -81,7 +88,7 @@ usage of 3rd party plugins.
 
 [license]: LICENSE.md
 [pro]: licenses/PRO-license.md
-[docs]: docs/6.6.1/index.md
+[docs]: docs/7.0.0-beta.0/index.md
 
 [download]: https://github.com/qwtel/hydejack/releases
 [gem]: https://rubygems.org/gems/jekyll-theme-hydejack

data/_includes/about.html

@@ -1,7 +1,8 @@
 {% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
 
 {% if author.about %}
-  <aside class="author" role="complementary">
-    {% include author.html author=author heading='About' heading_tag='h2' %}
+  <aside class="author related mb4" role="complementary">
+    {% assign about_heading = site.data.strings.about | default:"About" %}
+    {% include author.html author=author heading=about_heading heading_tag='h2' %}
   </aside>
 {% endif %}

data/_includes/author.html

@@ -1,17 +1,24 @@
+{% assign plugins = site.plugins | default:site.gems %}
+
 <div class="author">
-  {% if include.author.picture %}
-    {% include srcset-img.html class="me" img=include.author.picture alt=include.author.name %}
+  {% assign author = include.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 %}
   {% endif %}
 
-  <{{ include.heading_tag | default:'h2' }} class="page-title hr">
-    {{ include.heading | default:include.author.name }}
-  </{{ include.heading_tag | default:'h2' }}>
+  {% assign heading_tag = include.heading_tag | default:'h2' %}
+  {% assign heading_id = include.heading_id %}
+  <{{ heading_tag }} {% if heading_id %}id="{{ heading_id }}"{% endif %} class="page-title hr">
+    {{ include.heading | default:author.name }}
+  </{{ heading_tag }}>
 
-  {{ include.author.about | markdownify }}
+  {{ .author.about | markdownify }}
 
-  {% if include.author.social %}
-    <div class="sidebar-social">
-      {% include social.html social=include.author.social %}
-    </div>
-  {% endif %}
+  <div class="sidebar-social">
+    {% include social.html author=author %}
+  </div>
 </div>

data/_includes/avatar-tag.html

@@ -0,0 +1,4 @@
+{% comment %}<!--
+Including `avatar` in a partial prevents a parse error when `jekyll-avatar` is not included.
+-->{% endcomment %}
+{% avatar user=include.user size=128 %}

data/_includes/body.html

@@ -1,34 +1,24 @@
-{% comment %}---------------------------
-              MENU
-------------------------{% endcomment %}
-<div class="navbar fixed-top">
-  <div class="content">
-    <span class="sr-only">Jump to:</span>
-    <a id="_menu" class="menu no-hover" href="#_title">
-      <span class="sr-only">Menu</span>
-    </a>
-  </div>
-</div>
+{% include body/menu.html %}
 
-{% comment %}---------------------------
-              CONTENT
-------------------------{% endcomment %}
-<div id="_yPushState">
-  <div class="fade-in">
-    <main id="_main" class="content" role="main" data-color="{{ color | escape }}" data-image="{{ image | escape }}">
-      {{ content }}
-
-      {% if site.disqus_shortname and page.comments %}
-        {% include comments.html %}
-      {% endif %}
-
-      {% include footer.html %}
-    </main>
-  </div>
+<hy-push-state>
+  <main
+    id="_main"
+    class="content fade-in layout-{{ page.layout }}"
+    role="main"
+    data-color="{{ color | escape }}"
+    {% unless image.background %}
+      data-image="{{ image | escape }}"
+      {% if image != 'none' %}data-overlay{% endif %}
+    {% else %}
+      data-background="{{ image.background | escape }}"
+      {% if image.overlay %}data-overlay{% endif %}
+    {% endunless %}
+    >
+    {{ content }}
+    {% include comments.html %}
+    {% include footer.html %}
+  </main>
   {% include sidebar.html %}
-</div>
+</hy-push-state>
 
-{% comment %}---------------------------
-              SCRIPTS
-------------------------{% endcomment %}
-{% include scripts.html %}
+{% include body/scripts.html %}

data/_includes/body/menu.html

@@ -0,0 +1,11 @@
+<div class="navbar fixed-top">
+  <div class="content">
+    <div class="nav-btn-bar">
+      <span class="sr-only">{{ site.data.strings.jump_to | default:"Jump to" }}{{ site.data.strings.colon }}</span>
+      <a id="_menu" class="nav-btn no-hover" href="#_title">
+        <span class="sr-only">{{ site.data.strings.navigation | default:"Navigation" }}</span>
+        <span class="icon-menu"></span>
+      </a>
+    </div>
+  </div>
+</div>

data/_includes/body/scripts.html

@@ -0,0 +1,18 @@
+{% unless page.redirect %}
+  {% if site.google_analytics %}
+  <script>
+    window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+    ga('create', '{{ site.google_analytics }}', 'auto');
+    ga('send', 'pageview');
+    loadJSDeferred('https://www.google-analytics.com/analytics.js');
+  </script>
+  {% endif %}
+
+  <!--[if gt IE 9]><!---->
+  {% capture js_url %}{% link assets/js/hydejack.js %}?v=7.0.0-beta.0{% endcapture %}
+  <script>loadJSDeferred('{{ js_url | relative_url }}');</script>
+
+  {% include my-scripts.html %}
+
+  <!--<![endif]-->
+{% endunless %}

data/_includes/comments.html

@@ -1,11 +1,13 @@
-<aside class="comments" role="complementary">
-  <h2>Comments</h2>
-  <hr/>
+{% assign disqus = site.disqus | default:site.disqus_shortname %}
+{% if disqus and page.comments %}
+<aside class="comments related" role="complementary">
+  <h2 class="hr">{{ site.data.strings.comments | default:"Comments" }}</h2>
 
   <div id="disqus_thread"></div>
 
   <script>
-    {% include scripts/load-disqus.min.js %}
+    {% include scripts/load-disqus.min.js disqus=disqus %}
   </script>
   <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
 </aside>
+{% endif %}

data/_includes/footer.html

@@ -1,9 +1,7 @@
-<footer>
+<footer role="contentinfo">
   <hr/>
   {% if site.copyright.size > 0 %}
-    {{ site.copyright | markdownify }}
+  <p><small class="copyright">{{ site.copyright }}</small></p>
   {% endif %}
-  <p>
-    <code>Powered by <a href="https://qwtel.com/hydejack/">Hydejack</a> v<span id="_version">6.6.1</span></code>
-  </p>
+  <p><small>Powered by <a href="https://qwtel.com/hydejack/">Hydejack</a> v<span id="_version">7.0.0-beta.0</span></small></p>
 </footer>

data/_includes/head.html

@@ -1,143 +1,5 @@
-{% comment %}---------------------------
-              META
-------------------------{% endcomment %}
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="format-detection" content="telephone=no">
-<meta http-equiv="x-ua-compatible" content="ie=edge">
-
-{% capture title %}
-  {% if page.url == "/" %}
-    {{ site.title }}{% if site.tagline %} &middot; {{ site.tagline }}{% endif %}
-  {% elsif page.title.size > 0 %}
-    {{ page.title }} &middot; {{ site.title }}
-  {% else %}
-    {{ site.title }}
-  {% endif %}
-{% endcapture %}
-
-{% unless page.redirect %}
-  <title>{{ title | strip }}</title>
-{% else %}
-  <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
-  <title>Redirecting...</title>
-{% endunless %}
-
-{% if page.description.size > 0 %}
-  {% assign description = page.description | markdownify %}
-{% elsif page.excerpt.size > 0 %}
-  {% assign description = page.excerpt %}
-{% else %}
-  {% assign description = site.description | markdownify %}
-{% endif %}
-<meta name="description" content="{{ description | strip_html | truncatewords:50 }}">
-
-{% if site.keywords or page.keywords %}
-  <meta name="keywords" content="{{ site.keywords | default: page.keywords | join:',' }}">
-{% endif %}
-
-{% comment %}---------------------------
-              LINKS
-------------------------{% endcomment %}
-<link rel="canonical" href="{{ page.url | absolute_url }}">
-
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }} Feed" href="{{ site.feed.path | default:'feed.xml' | absolute_url }}">
-
-{% if page.previous %}
-  <link rel="prev" href="{{ page.previous.url | absolute_url }}">
-{% endif %}
-
-{% if page.next %}
-  <link rel="next" href="{{ page.next.url | absolute_url }}">
-{% endif %}
-
-<link rel="apple-touch-icon" href="{{ 'apple-touch-icon.png' | relative_url }}">
-<!-- Place favicon.ico in the root directory -->
-
-{% comment %}
-The links below are only here because we want to use the `href` property in JS (see `_js/src/katex.js`).
-We want to avoid building the URL dynamically in JS, because it depends on your `baseurl` and CDN optimizers can't find and modify it there.
-{% 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 }}">
-
-{% comment %}---------------------------
-              SCRIPTS
-------------------------{% endcomment %}
-<!--[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.no_google_fonts %}
-    google: {
-      families: '{{ google_fonts }}'.split('|')
-    },
-    {% endunless %}
-
-    custom: {
-      families: ['icomoon'],
-      urls: ['{{ icons_url | relative_url }}']
-    }
-  };
-</script>
-<!--<![endif]-->
-
-<script>
-  {% include scripts/load-js-deferred.min.js %}
-  {% include scripts/loadCSS.min.js %}
-  {% include scripts/cssrelpreload.min.js %}
-  window.disablePushState = {{ site.disable_push_state | default:false}};
-  window.disableDrawer = {{ site.disable_drawer | default:false}};
-</script>
-
-<!--[if lt IE 9]>
-<script src="{{ '/assets/bower_components/html5shiv/dist/html5shiv.min.js' | relative_url }}"></script>
-<![endif]-->
-
-{% comment %}---------------------------
-              STYLES
-------------------------{% endcomment %}
-<!--[if gt IE 8]><!---->
-<style>
-  {% capture include_to_scssify %}
-  {% include styles/inline.scss %}
-  {% endcapture %}
-  {{ include_to_scssify | scssify }}
-</style>
-
-{% capture style_url %}{% link assets/css/hydejack.css %}?v=6.6.1{% endcapture %}
-<link id="_stylePreload" rel="preload" as="style" href="{{ style_url | relative_url }}">
-<script>document.getElementById('_stylePreload').onload=function(){this.rel='stylesheet'}</script>
-
-{% include page-style.html %}
-
-<noscript>
-  <link rel="stylesheet" href="{{ style_url | relative_url }}">
-
-  {% 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 google_fonts = site.google_fonts | default:"Roboto+Slab:700|Noto+Sans:400,400i,700,700i" %}
-
-  {% unless site.no_google_fonts %}
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ google_fonts }}">
-    <style>
-      html { font-family: {{ font }} }
-      h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading }} }
-    </style>
-  {% endunless %}
-
-  {% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
-  <link rel="stylesheet" href="{{ icons_url | relative_url }}">
-</noscript>
-<!--<![endif]-->
-
-{% comment %}---------------------------
-              CUSTOMIZATION
-------------------------{% endcomment %}
-
+{% include head/meta.html %}
+{% include head/links.html %}
+{% include head/scripts.html %}
+{% include head/styles.html %}
 {% include my-head.html %}
-
-<!--[if gt IE 8]><!---->
-<script async src="{{ '/assets/bower_components/webfontloader/webfontloader.js' | relative_url }}"></script>
-<!--<![endif]-->

data/_includes/head/links.html

@@ -0,0 +1,25 @@
+{% comment %}<!-- Canonical link will be generated by SEO tag -->{% endcomment %}
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} Feed" href="{{ site.feed.path | default:'feed.xml' | absolute_url }}">
+
+{% assign lang = page.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/apple-touch-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 %}<!--
+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.
+-->{% 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 }}">

data/_includes/head/meta.html

@@ -0,0 +1,30 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
+
+{% unless page.redirect %}
+  {% if plugins contains 'jekyll-seo-tag' %}{% include head/seo-tag.html %}
+  {% else %}{% include head/seo-fallback.html %}{% endif %}
+
+  {% if site.keywords or page.keywords %}
+    <meta name="keywords" content="{{ page.keywords | default:site.keywords | join:',' }}">
+  {% endif %}
+{% 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="{{ color | default:'#4fb1ba' }}">
+{% endunless %}
+
+<meta name="generator" content="Hydejack v7.0.0-beta.0" />

data/_includes/head/scripts.html

@@ -0,0 +1,44 @@
+<script>
+  {% include scripts/load-js-deferred.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>
+  {% endunless %}
+
+  <link rel="stylesheet" href="{{ icons_url | relative_url }}">
+</noscript>