jekyll-theme-hydejack 8.0.0 → 8.1.0

data/_includes/styles/style.scss

@@ -18,11 +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" %}
-
-$font-family-heading: {{ font_heading }};
-$font-family: {{ font }};
+$font-family-heading: {{ site.font_heading | default:"Roboto Slab, Helvetica, Arial, sans-serif" }};
+$font-family:         {{ site.font         | default:"Noto Sans, Helvetica, Arial, sans-serif"   }};
 
 @import "variables";
 @import "my-variables";
@@ -31,35 +28,35 @@ $font-family: {{ font }};
 @import "reboot-mod";
 
 {% unless site.hydejack.no_inline_css or jekyll.environment == 'development' %}
-  @import "pooleparty/__link/base";
-  @import "pooleparty/__link/type";
-  @import "pooleparty/__link/table";
-  @import "pooleparty/__link/footer";
-  @import "pooleparty/__link/footnotes";
-  @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";
-  @import "hydejack/__link/content";
-  @import "hydejack/__link/avatar";
-  @import "hydejack/__link/katex";
-  @import "hydejack/__link/footer";
+  @import "pooleparty/__link__/base";
+  @import "pooleparty/__link__/type";
+  @import "pooleparty/__link__/table";
+  @import "pooleparty/__link__/footer";
+  @import "pooleparty/__link__/footnotes";
+  @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";
+  @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";

data/_includes/templates/back.html

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

data/_includes/templates/index.html

@@ -6,6 +6,6 @@
 {% include templates/error.html %}
 {% include templates/back.html %}
 {% include templates/permalink.html %}
-{% if site.google_analytics and site.hydejack.cookies_banner %}
-  {% include templates/cookies-banner.html %}
+{% if site.hydejack.cookies_banner %}
+  {% include templates/pro/cookies-banner.html %}
 {% endif %}

data/_includes/templates/loading.html

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

data/_includes/templates/{cookies-banner.html → pro/cookies-banner.html}

@@ -1,8 +1,8 @@
 <template id="_cookies-banner-template" hidden>
-  <div id="_cookies-banner" class="navbar fixed-top CookiesOK">
+  <div id="_cookies-banner" class="navbar fixed-bottom CookiesOK">
     <div class="content">
       <div class="nav-btn-bar">
-        <small class="nav-btn">
+        <small class="nav-btn fl">
           <span>{{ site.data.strings.cookies_banner.text | default:'This site uses cookies.' | markdownify | replace:'<p>','' | replace:'</p>','' }}</span>
           <button id="_cookies-ok" class="btn btn-primary btn-sm">{{ site.data.strings.cookies_banner.okay | default:'Okay' }}</button>
         </small>

data/_layouts/base.html

@@ -21,13 +21,13 @@ layout: compress
 
 {% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] | default:site.author %}
 
+{% assign image       = site.accent_image | default:'/assets/img/sidebar-bg.jpg' %}
 {% 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 %}{% 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 %}
+{% if page.accent_image %}{% assign image       = page.accent_image %}{% endif %}
+{% if page.accent_color %}{% assign color       = page.accent_color %}{% endif %}
+{% if page.theme_color  %}{% assign theme_color = page.theme_color  %}{% endif %}
 
 <head>
   {% include head/index.html %}

data/_layouts/compress.html

@@ -10,6 +10,6 @@
                 /\___/                \ \____/
                 \/__/                  \/___/
 
-Powered by Hydejack v8.0.0 <https://hydejack.com/>
+Powered by Hydejack v8.1.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/_sass/_mixins.scss

@@ -13,17 +13,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-@mixin pre($padding: 1rem) {
-  margin-left: -1rem;
-  margin-right: -1rem;
-  padding: $padding;
-  background-color: $code-bg;
-
-  @media print {
-    width: 100%!important;
-    page-break-inside: avoid;
-    break-inside: avoid-page;
-  }
+body {
+  --code-font-family: #{$code-font-family};
+
+  --font-weight: #{$font-weight};
+  --font-weight-bold: #{$font-weight-bold};
+  --font-weight-heading: #{$font-weight-heading};
+
+  --text-muted: #{$gray};
+  --gray-bg: #{$gray-bg};
+  --gray-text: #{$gray-text};
+  --menu-text: #{$menu-text};
+  --body-color: #{$body-color};
+  --body-bg: #{$body-bg};
+  --border-color: #{$border-color};
 }
 
 @mixin aspect-ratio($width, $height) {
@@ -45,8 +48,16 @@
   }
 }
 
-@mixin clearfix() {
+.clearfix {
   content: "";
   display: table;
   clear: both;
 }
+
+.color-transition {
+  transition: background-color 1s ease, border-color 1s ease;
+}
+
+.no-color-transition {
+  transition: none!important;
+}

data/_sass/_syntax.scss

@@ -1,67 +1,131 @@
-/*
- * GitHub style for Pygments syntax highlighter, for use with Jekyll
- * Courtesy of GitHub.com
- */
-
-.highlight .c { color: #999988; font-style: italic; }
-// .highlight .err { color: #a61717; background-color: #e3d2d2; }
-.highlight .k { font-weight: bold; }
-.highlight .o { font-weight: bold; }
-.highlight .cm { color: #999988; font-style: italic; }
-.highlight .cp { color: #999999; font-weight: bold; }
-.highlight .c1 { color: #999988; font-style: italic; }
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic; }
-.highlight .gd { color: #000000; background-color: #ffdddd; }
-.highlight .gd .x { color: #000000; background-color: #ffaaaa; }
-.highlight .ge { font-style: italic; }
-.highlight .gr { color: #aa0000; }
-.highlight .gh { color: #999999; }
-.highlight .gi { color: #000000; background-color: #ddffdd; }
-.highlight .gi .x { color: #000000; background-color: #aaffaa; }
-.highlight .go { color: #888888; }
-.highlight .gp { color: #555555; }
-.highlight .gs { font-weight: bold; }
-.highlight .gu { color: #800080; font-weight: bold; }
-.highlight .gt { color: #aa0000; }
-.highlight .kc { font-weight: bold; }
-.highlight .kd { font-weight: bold; }
-.highlight .kn { font-weight: bold; }
-.highlight .kp { font-weight: bold; }
-.highlight .kr { font-weight: bold; }
-.highlight .kt { color: #445588; font-weight: bold; }
-.highlight .m { color: #009999; }
-.highlight .s { color: #dd1144; }
-.highlight .n { color: #333333; }
-.highlight .na { color: teal; }
-.highlight .nb { color: #0086b3; }
-.highlight .nc { color: #445588; font-weight: bold; }
-.highlight .no { color: teal; }
-.highlight .ni { color: purple; }
-.highlight .ne { color: #990000; font-weight: bold; }
-.highlight .nf { color: #990000; font-weight: bold; }
-.highlight .nn { color: #555555; }
-.highlight .nt { color: navy; }
-.highlight .nv { color: teal; }
-.highlight .ow { font-weight: bold; }
-.highlight .w { color: #bbbbbb; }
-.highlight .mf { color: #009999; }
-.highlight .mh { color: #009999; }
-.highlight .mi { color: #009999; }
-.highlight .mo { color: #009999; }
-.highlight .sb { color: #dd1144; }
-.highlight .sc { color: #dd1144; }
-.highlight .sd { color: #dd1144; }
-.highlight .s2 { color: #dd1144; }
-.highlight .se { color: #dd1144; }
-.highlight .sh { color: #dd1144; }
-.highlight .si { color: #dd1144; }
-.highlight .sx { color: #dd1144; }
-.highlight .sr { color: #009926; }
-.highlight .s1 { color: #dd1144; }
-.highlight .ss { color: #990073; }
-.highlight .bp { color: #999999; }
-.highlight .vc { color: teal; }
-.highlight .vg { color: teal; }
-.highlight .vi { color: teal; }
-.highlight .il { color: #009999; }
-.highlight .gc { color: #999; background-color: #EAF2F5; }
+.highlight,
+pre.highlight {
+  // background: #fafafa;
+  color: #383a42;
+}
+.highlight pre {
+  // background: #fafafa;
+}
+.highlight .ge {
+  font-style: italic;
+}
+.highlight .gs {
+  font-weight: 700;
+}
+.highlight .ow {
+  font-weight: 700;
+}
+.highlight .n,
+.highlight .nf,
+.highlight .nn,
+.highlight .o,
+.highlight .p {
+  color: #383a42;
+}
+.highlight .c,
+.highlight .c1,
+.highlight .cm,
+.highlight .cp,
+.highlight .cs {
+  color: #a0a1a7;
+  font-style: italic;
+}
+.highlight .sr,
+.highlight .ss {
+  color: #0184bc;
+}
+.highlight .k,
+.highlight .kc,
+.highlight .kd,
+.highlight .kn,
+.highlight .kp,
+.highlight .kr,
+.highlight .kt {
+  color: #a626a4;
+}
+.highlight .l,
+.highlight .ld,
+.highlight .s,
+.highlight .s1,
+.highlight .s2,
+.highlight .sb,
+.highlight .sc,
+.highlight .sd,
+.highlight .se,
+.highlight .sh,
+.highlight .si,
+.highlight .sx {
+  color: #50a14f;
+}
+.highlight .nt,
+.highlight .nx,
+.highlight .vi {
+  color: #e45649;
+}
+.highlight .il,
+.highlight .m,
+.highlight .mf,
+.highlight .mh,
+.highlight .mi,
+.highlight .mo,
+.highlight .na {
+  color: #986801;
+}
+.highlight .bp,
+.highlight .nb,
+.highlight .nc,
+.highlight .nd,
+.highlight .ne,
+.highlight .ni,
+.highlight .nl,
+.highlight .no,
+.highlight .nv,
+.highlight .py,
+.highlight .vc,
+.highlight .vg {
+  color: #c18401;
+}
+// .highlight .err {
+//   color: #fff;
+//   background-color: #ff1414;
+// }
+.highlight .gd {
+  color: #ff1414;
+}
+.highlight .gi {
+  color: #2db448;
+}
+.highlight .w {
+  color: #f8f8f2;
+}
+.highlight .cpf {
+  color: navy;
+}
+.highlight .gu {
+  color: #75715e;
+}
+.highlight .lineno {
+  color: #9d9d9f;
+  user-select: none;
+}
+.highlight .ln {
+  color: #9d9d9f;
+  user-select: none;
+}
+.highlight .ln:after {
+  content: " ";
+}
+.highlight .hll {
+  color: #383a42;
+  background-color: #e5e5e6;
+}
+.highlight .hl {
+  color: #383a42;
+  background-color: #e5e5e6;
+}
+.highlight .language-json .w + .s2 {
+  color: #e45649;
+}
+.highlight .language-json .kc {
+  color: #0184bc;
+}

data/_sass/_variables.scss

@@ -16,6 +16,10 @@
 $gray: #888;
 $gray-bg: rgba(0,0,0,.025);
 $gray-text: #666;
+$menu-text: #bbb;
+$body-color: #333;
+$body-bg: #fff;
+$border-color: #ebebeb;
 
 $root-font-size: 16px;
 $root-font-size-medium: 17px;
@@ -27,14 +31,7 @@ $font-weight: 400;
 $font-weight-bold: 700;
 $font-weight-heading: 400;
 
-$body-color: #333;
-$body-bg: #fff;
-
-$border-color: #eee;
-
 $code-font-family: Menlo, Monaco, Consolas, monospace;
-$code-color: inherit;
-$code-bg: $gray-bg;
 
 // Breakpoints and content width. All units must be in rem!
 // NOTE: Duplicated values from `_js/src/drawer.js`.

data/_sass/hydejack/{__inline → __inline__}/_avatar.scss

@@ -6,7 +6,7 @@
 //
 // During development you can run `npm run watch:css`
 // to continuosly rebuild this file.
-//
+
 // Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
 //
 // This program is free software: you can redistribute it and/or modify

data/_sass/hydejack/{__inline → __inline__}/_base.scss

@@ -6,7 +6,7 @@
 //
 // During development you can run `npm run watch:css`
 // to continuosly rebuild this file.
-//
+
 // Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
 //
 // This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
   body::before {
     content: '';
     width: .5rem;
-    background: $border-color;
+    background: var(--border-color);
     position: fixed;
     left: 0;
     top: 0;

data/_sass/hydejack/{__inline → __inline__}/_break-layout.scss

@@ -6,7 +6,7 @@
 //
 // During development you can run `npm run watch:css`
 // to continuosly rebuild this file.
-//
+
 // Copyright (c) 2017 Florian Klampfer <https://qwtel.com/>
 //
 // This program is free software: you can redistribute it and/or modify