jekyll-theme-hydejack 8.5.2 → 9.0.0

data/_includes/styles/page-style.scss

@@ -1,64 +1,9 @@
-// These styles interact with JavsScript!
-// Their ordering MUST NOT be changed. See `_js/cross-fader.js`!
-
 {% assign color       = include.color       | default:'#4fb1ba' %}
 {% assign theme_color = include.theme_color | default:'#193747' %}
 
-// 0
-.content a:not(.btn) {
-  color: {{ color }};
-  border-color: fade-out({{ color }}, 0.8);
-}
-
-// 1
-.content a:not(.btn):hover {
-  border-color: {{ color }};
-}
-
-// 2
-:focus {
-  outline-color: {{ color }}!important;
-}
-
-// 3
-.btn-primary {
-  color: #fff;
-  background-color: {{ color }};
-  border-color: {{ color }};
-}
-
-// 4
-.btn-primary:focus, .btn-primary.focus, .form-control:focus, .form-control.focus {
-  box-shadow: 0 0 0 3px rgba({{ color }}, .5);
+html {
+  --accent-color: {{ color }};
+  --accent-color-faded: #{fade-out({{ color }}, 0.5)};
+  --accent-color-darkened: #{darken({{ color }}, 7.5%)};
+  --theme-color: {{ theme_color }};
 }
-
-// 5
-.btn-primary:hover, .btn-primary.hover {
-  color: #fff;
-  background-color: darken({{ color }}, 7.5%);
-  border-color: darken({{ color }}, 7.5%);
-}
-
-// 6
-.btn-primary:disabled, .btn-primary.disabled {
-  color: #fff;
-  background-color: {{ color }};
-  border-color: {{ color }};
-}
-
-// 7
-.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 }};
-}
-
-::-moz-selection {
-  color: #fff;
-  background: {{ color }};
-}

data/_includes/styles/style.scss

@@ -1,27 +1,19 @@
-// 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";
@@ -48,23 +40,24 @@ $theme-color:         {{ site.theme_color  | default:'#193747' }};
   @import "hydejack/__link__/sidebar";
   @import "hydejack/__link__/social";
   @import "hydejack/__link__/menu";
+  @import "hydejack/__link__/toc";
   @import "hydejack/__link__/content";
   @import "hydejack/__link__/avatar";
   @import "hydejack/__link__/katex";
   @import "hydejack/__link__/footer";
 
   {% unless site.hydejack.no_mark_external or site.no_mark_external %}
-  @import "hydejack/__link__/mark-external";
+    @import "hydejack/__link__/mark-external";
   {% endunless %}
+
   {% unless site.hydejack.no_break_layout %}
-  @import "hydejack/__link__/break-layout";
+    @import "hydejack/__link__/break-layout";
   {% endunless %}
 
-  @import "syntax";
-  @import "spinner";
-
   @import "my-style";
 {% else %}
+  @import "html";
+
   @import "pooleparty/_base.pre.scss";
   @import "pooleparty/_type.pre.scss";
   @import "pooleparty/_table.pre.scss";
@@ -84,6 +77,7 @@ $theme-color:         {{ site.theme_color  | default:'#193747' }};
   @import "hydejack/_sidebar.pre.scss";
   @import "hydejack/_social.pre.scss";
   @import "hydejack/_menu.pre.scss";
+  @import "hydejack/_toc.pre.scss";
   @import "hydejack/_content.pre.scss";
   @import "hydejack/_avatar.pre.scss";
   @import "hydejack/_katex.pre.scss";
@@ -92,22 +86,17 @@ $theme-color:         {{ site.theme_color  | default:'#193747' }};
   {% unless site.hydejack.no_mark_external or site.no_mark_external %}
     @import "hydejack/_mark-external.pre.scss";
   {% endunless %}
+   
   {% unless site.hydejack.no_break_layout %}
     @import "hydejack/_break-layout.pre.scss";
   {% endunless %}
 
-  @import "syntax";
-  @import "spinner";
-
   @import "my-inline";
   @import "my-style";
 
-  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 %}
 {% endunless %}
+
+@import "spinner";
+
+@import "syntax";

data/_includes/styles/variables.scss

@@ -0,0 +1,62 @@
+// Copyright (c) 2020 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/>.
+
+/*{% assign vars = site.data.variables %}*/
+
+$font-family:         {{ vars.font         | default:site.font                             }};
+$font-family-heading: {{ vars.font_heading | default:site.font_heading                     }};
+$code-font-family:    {{ vars.font_code    | default:site.font_code                        }};
+$theme-color:         {{ vars.theme_color  | default:site.theme_color | default:'#193747'  }};
+
+$root-font-size:        {{ vars.root_font_size        | default:15 }}px;
+$root-font-size-medium: {{ vars.root_font_size_medium | default:16 }}px;
+$root-font-size-large:  {{ vars.root_font_size_large  | default:17 }}px;
+$root-font-size-print:  {{ vars.root_font_size_print  | default:9  }}pt;
+$root-line-height:      {{ vars.root_line_height      | default:1.75 }};
+
+$font-weight:         {{ vars.font_weight         | default:400 }};
+$font-weight-bold:    {{ vars.font_weight_bold    | default:700 }};
+$font-weight-heading: {{ vars.font_weight_heading | default:700 }};
+
+$content-width:   {{ vars.content_width   | default:42 }}rem;
+$content-width-2: {{ vars.content_width_2 | default:48 }}rem;
+$content-width-5: {{ vars.content_width_5 | default:54 }}rem;
+
+$content-padding: {{ vars.content_padding | default:1 }}rem;
+
+$sidebar-width: {{ vars.sidebar_width | default:21 }}rem;
+
+$break-point-1: {{ vars.break_point_1 | default:42 }}em;
+$break-point-2: {{ vars.break_point_2 | default:54 }}em;
+$break-point-3: {{ vars.break_point_3 | default:64 }}em;
+$break-point-4: {{ vars.break_point_4 | default:72 }}em;
+$break-point-5: {{ vars.break_point_5 | default:86 }}em;
+
+$break-point-font-large: {{ vars.break_point_font_large | default:124 }}em;
+
+$content-margin-3: 3rem;
+$content-margin-5: 4rem;
+
+// TODO: doc
+$half-content: ($content-width-5 / 2) + $content-margin-5;
+
+// The sidebar width starts adjusting dynamically when the content is at the center of the window.
+// This is the case when the window size has a `min-width` of content area + twice the sidebar (left, right):
+//
+// $break-point-dynamic: $content-width-5 + (2 * $content-margin-5) + (2 * $sidebar-width); // = 104rem
+//
+// HACK: Since Chrome doesn't treat rem values in media queries correctly,
+// we hard-code the pixel value for the values above.
+$break-point-dynamic: ({{ vars.content_width_5 | default:54 }} + (2 * {{ vars.content_margin_5 | default:4 }}) + (2 * {{ vars.sidebar_width | default:21 }})) * {{ vars.root_font_size_medium | default:16 }}px;

data/_includes/templates/animation.html

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

data/_includes/templates/back.html

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

data/_includes/templates/error.html

@@ -1,4 +1,4 @@
-<template id="_error-template" hidden>
+<template id="_error-template">
   <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/forward.html

@@ -1,5 +1,5 @@
-<template id="_forward-template" hidden>
-  <button id="_forward" class="forward nav-btn no-hover fl">
+<template id="_forward-template">
+  <button id="_forward" class="forward nav-btn no-hover">
     <span class="sr-only">{{ strings.forward | default:"Forward" }}</span>
     <span class="icon-arrow-right2"></span>
   </button>

data/_includes/templates/index.html

@@ -1,12 +1,11 @@
-{% assign strings = site.data.strings %}
-<h2 class="sr-only" hidden>{{ strings.templates | default: "Templates"}}{{ strings.colon | default:":" }}</h2>
+<div hidden>
+  {% assign strings = site.data.strings %}
+  <h2 class="sr-only">{{ strings.templates | default: "Templates"}}{{ strings.colon | default:":" }}</h2>
 
-{% include templates/animation.html %}
-{% include templates/loading.html %}
-{% include templates/error.html %}
-{% include templates/forward.html %}
-{% include templates/back.html %}
-{% include templates/permalink.html %}
-{% if site.hydejack.cookies_banner %}
-  {% include templates/pro/cookies-banner.html %}
-{% endif %}
+  {% include templates/animation.html %}
+  {% include templates/loading.html %}
+  {% include templates/error.html %}
+  {% include templates/forward.html %}
+  {% include templates/back.html %}
+  {% include templates/permalink.html %}
+</div>

data/_includes/templates/loading.html

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

data/_includes/templates/permalink.html

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

data/_layouts/about.html

@@ -23,7 +23,7 @@ layout: base
     {% 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 %}
+        {% include_cached 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 %}

data/_layouts/base.html

@@ -17,6 +17,11 @@
 layout: compress
 ---
 
+{% assign version = jekyll.version | split:'.' %}
+{% assign major = v[0] %}
+{% assign minor = v[1] %}
+{% assign patch = v[2] %}
+
 {% assign plugins = site.plugins | default:site.gems %}
 
 {% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
@@ -33,6 +38,6 @@ layout: compress
   {% include head/index.html %}
 </head>
 
-<body class="no-color-transition">
+<body class="{% include_cached base-classes %}">
   {% include body/index.html %}
 </body>

data/_layouts/blog.html

@@ -20,13 +20,15 @@ layout: base
 {% assign plugins = site.plugins | default:site.gems %}
 
 {% if plugins contains 'jekyll-paginate' %}
-  {% for post in paginator.posts %}
-    {% include components/post.html post=post no_link_title=page.no_link_title no_excerpt=page.no_excerpt hide_image=page.hide_image %}
-  {% endfor %}
+  {% assign posts = paginator.posts %}
+{% else %}
+  {% assign posts = site.categories[page.slug] | default:site.tags[page.slug] | default:site.posts %}
+{% endif %}
+  
+{% for post in posts %}
+  {% include_cached components/post.html post=post no_link_title=page.no_link_title no_excerpt=page.no_excerpt hide_image=page.hide_image %}
+{% endfor %}
 
+{% if plugins contains 'jekyll-paginate' %}
   {% include components/pagination.html %}
-{% else %}
-  {% capture text %}To use this layout, include the `jekyll-paginate` plugin in your `Gemfile` and your `_config.yml` under `plugins`.
-For more, see [Jekyll Pagination](https://jekyllrb.com/docs/pagination/).{% endcapture %}
-  {% include components/message.html text=text %}
 {% endif %}

data/_layouts/compress.html

@@ -10,6 +10,6 @@
                 /\___/                \ \____/
                 \/__/                  \/___/
 
-Powered by Hydejack v8.5.2 <https://hydejack.com/>
+Powered by Hydejack v9.0.0 <https://hydejack.com/>
 -->{% capture _LINE_FEED %}
 {% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ content | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}</html>

data/_layouts/default.html

@@ -27,20 +27,20 @@ layout: base
 
   {{ content }}
 
-  <hr class="dingbat"/>
+  <hr class="dingbat related"/>
 
   {% if site.posts.size > 0 %}
-    <h2 class="hr">{{ strings.posts | default:"Posts" }}</h2>
+    <h2 class="hr-bottom">{{ strings.posts | default:"Posts" }}</h2>
     <ul class="related-posts">
       {% for post in site.posts limit:5 %}
-        {% include components/post-list-item.html post=post %}
+        {% include_cached components/post-list-item.html post=post %}
       {% endfor %}
     </ul>
   {% endif %}
 
   {% assign pages = site.html_pages | where:"layout","page" | where_exp:"page","page.sitemap != false" %}
   {% if pages.size > 0 %}
-    <h2 class="hr">{{ strings.pages | default:"Pages" }}</h2>
+    <h2 class="hr-bottom">{{ strings.pages | default:"Pages" }}</h2>
     <ul class="related-posts">
       {% for page in pages limit:5 %}
         {% if page.layout == 'page' %}

data/_layouts/list.html

@@ -14,33 +14,27 @@
 # 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
+layout: page
 ---
 
-{% assign posts = site.categories[page.slug] | default:site.tags[page.slug] | default:site.posts %}
-
-{% if page.title.size > 0 %}
-  <header>
-    <h1 class="page-title">{{ page.title }}</h1>
-    {% include components/message.html text=page.description hide=page.hide_description %}
-  </header>
-  <hr class="sr-only"/>
-{% endif %}
-
 {{ content }}
 
+{% assign posts = site.categories[page.slug] | default:site.tags[page.slug] | default:site.posts %}
+
 {% assign date_formats  = site.data.strings.date_formats               %}
 {% assign list_group_by = date_formats.list_group_by | default:"%Y"    %}
 {% assign list_entry    = date_formats.list_entry    | default:"%d %b" %}
 
+{% assign prev_date = 0 %}
+{% if page.no_groups %}<ul class="related-posts">{% endif %}
 {% for post in posts %}
-  {% assign currentdate = post.date | date:list_group_by %}
-  {% if currentdate != date %}
+  {% assign current_date = post.date | date:list_group_by %}
+  {% unless page.no_groups %}{% if current_date != prev_date %}
     {% unless forloop.first %}</ul>{% endunless %}
-    <h2 id="{{ list_group_by | slugify }}-{{ currentdate | slugify }}" class="hr">{{ currentdate }}</h2>
+    <h2 id="{{ list_group_by | slugify }}-{{ current_date | slugify }}" class="hr-bottom">{{ current_date }}</h2>
     <ul class="related-posts">
-    {% assign date = currentdate %}
-  {% endif %}
-  {% include components/post-list-item.html post=post format=list_entry %}
+    {% assign prev_date = current_date %}
+  {% endif %}{% endunless %}
+  {% include_cached components/post-list-item.html post=post format=list_entry %}
   {% if forloop.last %}</ul>{% endif %}
 {% endfor %}

data/_layouts/page.html

@@ -24,4 +24,5 @@ layout: base
   </header>
 
   {{ content }}
+  {% include body/comments.html %}
 </article>