jekyll-theme-hydejack 6.0.0.pre.alpha → 6.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf9d37d50e4cab33d59e273fe085dd000993f32
-  data.tar.gz: 59bf9eeac89a112534fed019a129da39439f4426
+  metadata.gz: f60e61d8d8c49226b4a8c5c4b4e0b4a7fb014429
+  data.tar.gz: b1d61e7346be85e5b00238481a26ca6d757d79f6
 SHA512:
-  metadata.gz: 792b2a5e1acb1258e680b629278d0a789b41a093a3fc289b2dde89ff8ec1de0a6056eaa399b432d075da340260574f6184d4100a20f72e18d973b7f177ff0d4a
-  data.tar.gz: 378ed68af45d912eccf10526f66c8031283bb3c3f56e5dc1a1c6bbe7f2a5d983acb5b5420c906ad26efdd5139856ad16dc5e375aa0d8ae67889f300e02908a6c
+  metadata.gz: a09aaf0df840fc8222a66a53e9ddae29d42400967b289a0eb7688085e61f955296711f60d3baa75bfd44f8695fd454a2f8a856a9c779de056b118d74cb2f667b
+  data.tar.gz: 4908cb5c8ffc57645a988dbfe1ab0c33e486b23da6affa74d14bcb55676d6d49cdacae23145f1bac68b71e693b19cc1db3014ab1120e524306b8f984b3fcf652

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Florian Klampfer.
+Copyright (c) 2017 Florian Klampfer.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,87 +1,3 @@
 # Hydejack
 
 Hydejack is a pretentious two-column [Jekyll](http://jekyllrb.com) theme, stolen by [`@qwtel`](https://twitter.com/qwtel) from [Hyde](http://hyde.getpoole.com). You could say it was.. [hydejacked](http://media3.giphy.com/media/makedRIckZBW8/giphy.gif).
-
-## Features
-Unlike Hyde, it's very opinionated about how you are going to use it.
-
-Features include:
-
-* Touch-enabled sidebar / drawer for mobile, including fallback when JS is disabled.
-* Github Pages compatible tag support based on [this post][tag].
-* Customizable link color and sidebar image, per-site, per-tag and per-post.
-* Optional author section at the bottom of each post.
-* Optional comment section powered by Disqus.
-* Layout for posts grouped by year
-* Wide array of social media icons on sidebar.
-* Math blocks via [KaTeX](https://khan.github.io/KaTeX/).
-
-## Download
-Hydejack is developed on and hosted with GitHub. Head to the [GitHub repository](https://github.com/qwtel/hydejack) for downloads, bug reports, and feature requests.
-
-## Sidebar
-I love the original Hyde theme, but unfortunately the layout isn't as great on small screens.
-Since the sidebar moves to the top, the user has to scroll down just to read the title of a blog post.
-
-By using a drawer component I was able to retain the original two column layout. It's possible to move the drawer via touch input (with the help of a little JavaScript).
-
-Since the background image contributes to the feel of the page I'm letting it peek over the edge a bit. This also provides a hint to the user that an interaction is possible.
-
-## Manual
-
-### Configuration
-You can configure important aspects of the theme via [`_config.yml`](https://github.com/qwtel/hydejack/blob/master/_config.yml). This includes:
-
-* the blog description in the sidebar
-* the (optional) author description and photo
-* default image and link color of the blog
-* the github and twitter usernames
-
-### How to Change the Image and Color of a Post
-In the manifest of a blog post, simply add an url as `image` and a CSS color as `color`:
-
-~~~yml
-layout: post
-title: Introducing Hydejack
-image: https://qwtel.com/hydejack/public/img/hyde.jpg
-color: '#949667'
-~~~
-
-### How to Add a New Tag
-Tags are possible, but they are not meant to be used #instagram #style: #food #goodfood #happy #happylife #didimentionfood #yougetthepoint. Each tag requires some setup work. I tend to think of it as categories that can be combined.
-
-1.  Add an entry to `_data/tags.yml`, where the key represents a slug and provide at least a `name` value and optionally `image`, `color` and `description`.
-
-    Example `/_data/tags.yml`:
-
-    ~~~yml
-    mytag:
-      name: My Tag
-    ~~~
-
-2.  Make a new file in the `tag` folder, using the same name you've used as the key / slug and change the `tag` and `permalink` entries.
-
-    Example `/tag/mytag.md`:
-
-    ~~~yml
-    layout: blog-by-tag
-    tag: mytag
-    permalink: /tag/mytag/
-    ~~~
-
-3.  Tag your blog posts using the `tags` key (color and image will only depend on the first tag).
-
-    ~~~yml
-    layout: post
-    title: Introducing My New Tag
-    tags: [mytag, othertag]
-    ~~~
-
-4. (optional) Add the tag to the sidebar, by adding it to `sidebar_tags` in `_config.yml`.
-   They will appear in the listed order.
-
-   ~~~yml
-   sidebar_tags: [mytag, othertag]
-   ~~~
-
-[tag]: http://www.minddust.com/post/tags-and-categories-on-github-pages/

data/_includes/about.html

@@ -1,8 +1,4 @@
-{% if page.author %}
-  {% assign author = site.data.authors[page.author] %}
-{% elsif site.author.authors_key %}
-  {% assign author = site.data.authors[site.author.authors_key] %}
-{% endif %}
+{% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] %}
 
 {% if author.about %}
   <aside class="author" role="complementary">

data/_includes/body.html

@@ -0,0 +1,31 @@
+<!-- =============== -->
+<!-- MENU            -->
+<!-- =============== -->
+<span class="sr-only">Jump to:</span>
+
+<a id="_menu" class="menu no-hover" href="#_title">
+  <span>☰</span>
+  <span class="sr-only">Menu</span>
+</a>
+
+<!-- =============== -->
+<!-- CONTENT         -->
+<!-- =============== -->
+<div id="_yPushState">
+  <main id="_main" class="content container" 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>
+  {% include sidebar.html %}
+</div>
+
+<!-- =============== -->
+<!-- SCRIPTS         -->
+<!-- =============== -->
+{% include scripts.html %}

data/_includes/copyright-header

@@ -8,8 +8,8 @@
  *                 /\___/                \ \____/
  *                 \/__/                  \/___/
  *
- * Copyright (c) 2017 Florian Klampfer.
- * Licensed under MIT.
- * Design: Hydejack by @qwtel. Get it at: https://qwtel.com/hydejack
- * Version: 6.0.0-alpha
+ * Copyright (c) 2017 Florian Klampfer
+ * Licensed under MIT
+ * Powered by Hydejack (https://qwtel.com/hydejack/)
+ * Version: 6.0.0-beta2
  */

data/_includes/footer.html

@@ -1,14 +1,9 @@
 <footer>
   <hr/>
+  {% if site.copyright.size > 0 %}
+    {{ site.copyright | markdownify }}
+  {% endif %}
   <p>
-    <span>{{ site.copyright | default:"&copy; 2017. All rights reserved." }}</span>
-    <br/>
-    <a class="code" href="https://qwtel.com/hydejack">
-      Made with
-      <span class="icon-droplet" title="Blood" style="color:#de6767"></span><span class="icon-droplet" title="Sweat" style="color:#66dcff"></span><span class="icon-droplet" title="Tears" style="color:#66beff"></span>
-      <span class="sr-only">blood, sweat and tears</span>
-      by
-      @qwtel
-    </a>
+    <code>Powered by <a href="https://qwtel.com/hydejack/">Hydejack</a> v<span id="_version">6.0.0-beta2</span></code>
   </p>
 </footer>

data/_includes/head.html

@@ -1,3 +1,6 @@
+<!-- =============== -->
+<!-- META            -->
+<!-- =============== -->
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
 <meta name="format-detection" content="telephone=no">
@@ -13,7 +16,12 @@
   {% endif %}
 {% endcapture %}
 
-<title>{{ title | strip }}</title>
+{% 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 %}
@@ -39,6 +47,20 @@
   <link rel="next" href="{{ page.next.url | absolute_url }}">
 {% endif %}
 
+<!-- =============== -->
+<!-- SCRIPTS         -->
+<!-- =============== -->
+<script>
+  window._version = '6.0.0-beta2';
+  {% include scripts/load-js-deferred.min.js %}
+  {% include scripts/loadCSS.min.js %}
+  {% include scripts/cssrelpreload.min.js %}
+</script>
+
+<!--[if lt IE 9]>
+<script src="https://unpkg.com/html5shiv/dist/html5shiv.min.js"></script>
+<![endif]-->
+
 <!-- =============== -->
 <!-- STYLES          -->
 <!-- =============== -->
@@ -50,38 +72,32 @@
   {{ include_to_scssify | scssify }}
 </style>
 
-{% capture style_url %}/assets/css/hydejack.css?v=6.0.0-alpha{% endcapture %}
+{% capture style_url %}{% link assets/css/hydejack.css %}?v=6.0.0-beta2{% endcapture %}
 <link rel="preload" href="{{ style_url | relative_url }}" as="style" onload="this.rel='stylesheet'">
 
 {% include page-style.html %}
 
-{% assign google_fonts = site.google_fonts | default:"Roboto+Slab:700|Noto+Serif:400,400i,700,700i" %}
-
 <noscript>
   <link rel="stylesheet" href="{{ style_url | relative_url }}">
 
+  {% assign font = site.font %}
+  {% assign font_heading = site.font_heading %}
+  {% assign google_fonts = site.google_fonts %}
+  {% unless font or font_heading or google_fonts %}
+    {% assign font = "'Noto Serif', Georgia, serif" %}
+    {% assign font_heading = "'Roboto Slab', Helvetica, Arial, sans-serif" %}
+    {% assign google_fonts = "Roboto+Slab:700|Noto+Serif:400,400i,700,700i" %}
+  {% endunless %}
+
   {% if google_fonts.size > 0 %}
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ site.google_fonts }}">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ google_fonts }}">
     <style>
-      html { font-family: {{ site.font }} }
-      h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ site.font_heading }} }
+      html { font-family: {{ font }} }
+      h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .heading { font-family: {{ font_heading }} }
     </style>
   {% endif %}
 
-  <link rel="stylesheet" href="{{ '/assets/icomoon/style.css' | relative_url }}">
+  {% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
+  <link rel="stylesheet" href="{{ icons_url | relative_url }}">
 </noscript>
 <!--<![endif]-->
-
-<!-- =============== -->
-<!-- SCRIPTS         -->
-<!-- =============== -->
-<script>
-  window._version = '6.0.0-alpha';
-  {% include scripts/load-js-deferred.min.js %}
-  {% include scripts/loadCSS.min.js %}
-  {% include scripts/cssrelpreload.min.js %}
-</script>
-
-<!--[if lt IE 9]>
-<script src="https://unpkg.com/html5shiv/dist/html5shiv.min.js"></script>
-<![endif]-->

data/_includes/icon-github.html

@@ -0,0 +1,2 @@
+<!-- This file is only here to prevent an error when using Hydejack with Jekyll's default content. -->
+GitHub

data/_includes/page-style.html

@@ -1,6 +1,12 @@
 <style id="_pageStyle">
+{% capture page_style %}
   .content a {
     color: {{ color }};
+    border-color: fade-out({{ color }}, 0.8);
+  }
+
+  .content a:hover {
+    border-color: {{ color }};
   }
 
   :focus {
@@ -16,4 +22,6 @@
     color: #fff;
     background: {{ color }};
   }
+{% endcapture %}
+{{ page_style | scssify }}
 </style>

data/_includes/related.html

@@ -9,7 +9,7 @@
       {% for post in site.related_posts limit:3 %}
         {% include post-list-item.html post=post format="%m/%d/%y" %}
       {% endfor %}
-    {% elsif post.categories.first != null %}
+    {% elsif post.categories.first %}
       {% assign category_posts = site.categories[post.categories.first] %}
       {% assign plusone = false %}
       {% for post in category_posts limit:4 %}
@@ -21,7 +21,7 @@
           {% include post-list-item.html post=post format="%m/%d/%y" %}
         {% endif %}
       {% endfor %}
-    {% elsif post.tags.first != null %}
+    {% elsif post.tags.first %}
       {% assign tag_posts = site.tags[post.tags.first] %}
       {% assign plusone = false %}
       {% for post in tag_posts limit:4 %}

data/_includes/scripts.html

@@ -4,6 +4,7 @@
 {% endunless %}
 
 <!--[if gt IE 8]><!---->
+{% capture icons_url %}{% link assets/icomoon/style.css %}{% endcapture %}
 <script>
   WebFontConfig = {
     {% if google_fonts %}
@@ -14,14 +15,16 @@
 
     custom: {
       families: ['icomoon'],
-      urls: ['{{ "/assets/icomoon/style.css" | relative_url }}']
+      urls: ['{{ icons_url | relative_url }}']
     }
   };
   loadJSDeferred('https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js');
 </script>
 
+{% unless page.redirect %}
+
 <!--[if gt IE 9]><!---->
-{% capture js_url %}/assets/js/hydejack.js?v=6.0.0-alpha{% endcapture %}
+{% capture js_url %}{% link assets/js/hydejack.js %}?v=6.0.0-beta2{% endcapture %}
 <script>loadJSDeferred('{{ js_url | relative_url }}');</script>
 <!--<![endif]-->
 
@@ -34,3 +37,5 @@
 </script>
 {% endif %}
 <!--<![endif]-->
+
+{% endunless %}

data/_includes/sidebar.html

@@ -11,7 +11,7 @@
         {% include nav.html %}
       </nav>
 
-      {% assign author = site.data.authors[site.author.authors_key] %}
+      {% assign author = site.data.authors.first[1] %}
       {% if author.social %}
         <div class="sidebar-social">
           {% include social.html social=author.social %}

data/_includes/styles/inline.scss

@@ -24,6 +24,7 @@
 @import "hydejack/social-inline";
 // @import "hydejack/social";
 @import "hydejack/menu-inline";
+@import "hydejack/menu";
 @import "hydejack/content-inline";
 @import "hydejack/me-inline";
 // @import "hydejack/katex";

data/_includes/styles/style.scss

@@ -24,6 +24,7 @@
 // @import "hydejack/social-inline";
 @import "hydejack/social";
 // @import "hydejack/menu-inline";
+// @import "hydejack/menu";
 // @import "hydejack/content-inline";
 // @import "hydejack/me-inline";
 @import "hydejack/katex";
@@ -54,7 +55,7 @@
 
 {% if site.mark_external %}
   @media screen {
-    a[href*="//"]:not([href*="{{ site.url }}"])::after {
+    a[href*="//"]::after, a.no-push-state::after {
       content: "\00A0\ea7e";
       font-family: 'icomoon' !important;
       speak: none;

data/_layouts/about.html

@@ -2,11 +2,7 @@
 layout: base
 ---
 
-{% if page.author %}
-  {% assign author = site.data.authors[page.author] %}
-{% elsif site.author.authors_key %}
-  {% assign author = site.data.authors[site.author.authors_key] %}
-{% endif %}
+{% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] %}
 
 <article class="page" role="article">
   {% if author.picture %}

data/_layouts/base.html

@@ -2,6 +2,8 @@
 layout: compress
 ---
 
+{% assign author = site.data.authors[page.author] | default:site.data.authors.first[1] %}
+
 {% assign color = site.color | default:'#A85641' %}
 {% assign image = site.image | default:'/assets/img/nap.jpg' %}
 
@@ -15,6 +17,9 @@ layout: compress
   {% assign tag = site.featured_tags | where: "slug", tag_name | first %}
   {% if tag.color %}{% assign color = tag.color %}{% endif %}
   {% if tag.image %}{% assign image = tag.image %}{% endif %}
+{% elsif author %}
+  {% if author.color %}{% assign color = author.color %}{% endif %}
+  {% if author.image %}{% assign image = author.image %}{% endif %}
 {% endif %}
 
 {% if page.color %}{% assign color = page.color %}{% endif %}
@@ -25,30 +30,5 @@ layout: compress
 </head>
 
 <body>
-  {% include menu.html %}
-
-  <div id="_yPushState">
-    <main id="_main" class="content container" role="main" data-color="{{ color | escape }}" data-image="{{ image | escape }}">
-
-      {% if page.layout == 'welcome' or page.layout == 'projects' or page.layout == 'project' or page.layout == 'resume' %}
-        <style>.warning{position:absolute;top:0;left:0;right:0;padding:1rem;font-size:smaller;} @media(max-width:800px){.warning{margin-left:2rem;}}</style>
-        {% capture warning %}
-**NOTE**: The `{{ page.layout }}` layout is not part of the free version of Hydejack.
-{:.warning.faded}
-        {% endcapture %}
-        {{ warning | markdownify }}
-      {% endif %}
-
-      {{ content }}
-
-      {% if site.disqus_shortname and page.comments %}
-        {% include comments.html %}
-      {% endif %}
-
-      {% include footer.html %}
-    </main>
-    {% include sidebar.html %}
-  </div>
-
-  {% include scripts.html %}
+  {% include body.html %}
 </body>