jekyll-theme-yat 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e681401f81b122a16cf17612a96244c85e60faa2724033d450558dc5ea0da91
-  data.tar.gz: b1f56bf69dd3a56dbe768f40f0d0bfd672129531d6e11e70ed35576a701fa5b0
+  metadata.gz: b89d81bb145293e81ec3ce978f1edd21f7fc3d6f415582cfa96162f9f56db586
+  data.tar.gz: 99a004e736ff24d67ea6e89f54b8cc166c6551517892d44660fdcaeec48152be
 SHA512:
-  metadata.gz: 9481a2e209c78103584a927c7ddc4c1709bdc0c450eaa9ca9bdd001cd3d86bf3937934c36e91a18afae36695958e3e4d53c2851633f2e3a9c910641a31eda02e
-  data.tar.gz: fc79d0d8ef27aa8ee594147a11940e77ab16857a53402f403175f8b8a244030978a5e00cd5651a52a1d3a1d737bfa45e57936e2d23f9881e95d17e00cc0d9cf5
+  metadata.gz: c75c4559995c0fe4766848031f1bc8d02335674e474e54fe1ffacaa6c7dafca04db93c8d277eae42169d3bea9f8c9cf7fecd6f10d7c5c13d7a172e4b62c0c034
+  data.tar.gz: 82379c7e536507ac69df959573ff951cae42e36a023b7a9833a067736275500879bceb98507704f08f231cbd5d15c0690b28126e4dcc694a10364e86d89bb4c6

data/README.md

@@ -18,8 +18,17 @@ Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme i
 
 </p>
 
+<h3 align="center">Night Mode</h3>
+
+<p align="center">
+
+  <img src="https://user-images.githubusercontent.com/9413601/94983351-760f6e00-0574-11eb-9494-5303ad6228dc.gif" alt="demo-screenshot" width="780px"/>
+
+</p>
+
 ## Features
 
+- Support beautiful __Night Mode__.
 - Full layouts `home`, `post`, `tags`, `archive` and `about`.
 - Uses font awesome 5 for icons.
 - Beautiful Syntax Highlight using [hilight.js][hilight-js].
@@ -33,7 +42,7 @@ Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme i
 - Google Translation support.
 - New post tag support.
 
-Also, visit the live [demo][yat-live-demo] site for the theme.
+Also, visit the [Live Demo][yat-live-demo] site for the theme.
 
 ## Installation
 

data/_includes/extensions/comments/disqus.html

@@ -8,8 +8,7 @@
     (function() {
       var d = document, s = d.createElement('script');
 
-      // s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';
-      s.src = 'https://jeffreytse.disqus.com/embed.js';
+      s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';
 
       s.setAttribute('data-timestamp', +new Date());
       (d.head || d.body).appendChild(s);

data/_includes/extensions/hashlocate.html

@@ -36,7 +36,7 @@
 
   // The first event occurred
   window.addEventListener('click', function(event) {
-    if (event.target.matches('a')) {
+    if (event.target.tagName.toLowerCase() == 'a') {
       hashLocate(event.target.getAttribute('href'));
     }
   });

data/_includes/extensions/theme-toggle.html

@@ -0,0 +1,90 @@
+<div class="theme-toggle">
+  <input type="checkbox" id="theme-switch">
+  <label for="theme-switch">
+    <div class="toggle"></div>
+    <div class="names">
+      <p class="light">Light</p>
+      <p class="dark">Dark</p>
+    </div>
+  </label>
+</div>
+
+<script>
+  (function() {
+    var sw = document.getElementById('theme-switch');
+    var html = document.getElementsByTagName('html')[0];
+    var themeData = loadThemeData();
+
+    function saveThemeData(data) {
+      localStorage.setItem('theme', JSON.stringify(data));
+    }
+
+    function loadThemeData() {
+      var data = localStorage.getItem('theme');
+      try {
+        data = JSON.parse(data ? data : '');
+      } catch(e) {
+        data = { nightShift: null, autoToggleAt: 0 };
+        saveThemeData(data);
+      }
+      return data;
+    }
+
+    function handleThemeToggle(nightShift) {
+      themeData.nightShift = nightShift;
+      saveThemeData(themeData);
+      html.dataset.theme = nightShift ? 'dark' : 'light';
+      setTimeout(function() {
+        sw.checked = nightShift ? true : false;
+      }, 50);
+    }
+
+    function autoThemeToggle() {
+      // Next time point of theme toggle
+      var now = new Date();
+      var toggleAt = new Date();
+      var hours = now.getHours();
+      var nightShift = hours >= 19 || hours <=7;
+
+      if (nightShift) {
+        if (hours > 7) {
+          toggleAt.setDate(toggleAt.getDate() + 1);
+        }
+        toggleAt.setHours(7);
+      } else {
+        toggleAt.setHours(19);
+      }
+
+      toggleAt.setMinutes(0);
+      toggleAt.setSeconds(0);
+      toggleAt.setMilliseconds(0)
+
+      var delay = toggleAt.getTime() - now.getTime();
+
+      // auto toggle theme mode
+      setTimeout(function() {
+        handleThemeToggle(!nightShift);
+      }, delay);
+
+      return {
+        nightShift: nightShift,
+        toggleAt: toggleAt.getTime()
+      };
+    }
+
+    var data = autoThemeToggle();
+
+    // Listen the theme toggle event
+    sw.addEventListener('change', function(event) {
+      handleThemeToggle(event.target.checked);
+    });
+
+    // Toggle theme by local setting
+    if (data.toggleAt > themeData.autoToggleAt) {
+      themeData.autoToggleAt = data.toggleAt;
+      handleThemeToggle(data.nightShift);
+    } else {
+      handleThemeToggle(themeData.nightShift);
+    }
+  })();
+</script>

data/_includes/functions.html

@@ -1,5 +1,6 @@
-{%- if include.func -%}
-  {%- assign func = include.func -%}
+{%- assign params = include -%}
+{%- if params.func -%}
+  {%- assign func = params.func -%}
 {%- endif -%}
 
 {%- assign include_path = func -%}
@@ -12,7 +13,7 @@
   {%- include functions/log.html level=include.level msg=include.msg -%}
 {%- else -%}
   {%- assign include_path = 'functions/' | append: include_path -%}
-  {%- include {{ include_path }} -%}
+  {%- include {{ include_path }} params=params-%}
 {%- endif -%}
 
 {%- if func != 'log' -%}

data/_includes/functions/get_datetimes.html

@@ -1,5 +1,5 @@
-{% if include.filter %}
-  {% assign filter = include.filter %}
+{% if include.params.filter %}
+  {% assign filter = include.params.filter %}
 {% endif %}
 
 {% assign split_mark = '<|>' %}

data/_includes/functions/get_reading_time.html

@@ -1,9 +1,9 @@
-{% if include.article %}
-  {% assign article = include.article %}
+{% if include.params.article %}
+  {% assign article = include.params.article %}
 {% endif %}
 
-{% if include.speed %}
-  {% assign speed = include.speed %}
+{% if include.params.speed %}
+  {% assign speed = include.params.speed %}
 {% else %}
   {% assign speed = 160 %}
 {% endif %}

data/_includes/functions/get_value.html

@@ -1,19 +1,19 @@
-{%- if include.name -%}
-  {%- assign name = include.name -%}
+{%- if include.params.name -%}
+  {%- assign name = include.params.name -%}
 {%- endif -%}
 
-{%- assign return = include.return -%}
-
-{%- if page[name] -%}
+{%- if page[name] != nil -%}
   {%- assign return = page[name] -%}
-{%- elsif site[name] -%}
+{%- elsif site[name] != nil -%}
   {%- assign return = site[name] -%}
-{%- elsif site.data[name] -%}
+{%- elsif site.data[name] != nil -%}
   {%- assign return = site.data[name] -%}
-{%- elsif site.defaults[page.layout][name] -%}
+{%- elsif site.defaults[page.layout][name] != nil -%}
   {%- assign return = site.defaults[page.layout][name] -%}
-{%- elsif site.data.defaults[page.layout][name] -%}
+{%- elsif site.data.defaults[page.layout][name] != nil -%}
   {%- assign return = site.data.defaults[page.layout][name] -%}
-{%- elsif layout[name] -%}
+{%- elsif layout[name] != nil -%}
   {%- assign return = layout[name] -%}
+{%- else -%}
+  {%- assign return = include.params.default -%}
 {%- endif -%}

data/_includes/functions/log.html

@@ -1,9 +1,9 @@
-{% if include.level %}
-  {% assign level = include.level %}
+{% if include.params.level %}
+  {% assign level = include.params.level %}
 {% endif %}
 
-{% if include.msg %}
-  {% assign msg = include.msg %}
+{% if include.params.msg %}
+  {% assign msg = include.params.msg %}
 {% endif %}
 
 {% if site.debug == true %}

data/_includes/sidebar/archive-list.html

@@ -6,5 +6,5 @@
 
 {% assign keys = datetimes %}
 {% assign field = 'date' %}
-{% assign url = '/archives.html' %}
+{% assign url = '/archives.html' | relative_url %}
 {% include sidebar/common-list.html %}

data/_includes/sidebar/article-menu.html

@@ -36,9 +36,13 @@
     // The header element
     var header = document.querySelector('header.site-header');
 
-    function doMenuCollapse(index, over_items=20) {
+    function doMenuCollapse(index, over_items) {
       var items = menuContent.firstChild.children;
 
+      if (over_items == undefined) {
+        over_items = 20;
+      }
+
       if (items.length < over_items) {
         return;
       }

data/_includes/sidebar/category-list.html

@@ -5,5 +5,5 @@
 
 {% assign keys = categories %}
 {% assign field = 'categories' %}
-{% assign url = '/categories.html' %}
+{% assign url = '/categories.html' | relative_url %}
 {% include sidebar/common-list.html %}

data/_includes/sidebar/common-list.html

@@ -9,7 +9,7 @@
 <div class="common-list">
   <ul>
     <li>
-      <a href="/index.html">
+      <a href="{{ '/index.html' | relative_url }}">
         All<span>{{ site.posts.size }}</span>
       </a>
     </li>

data/_includes/sidebar/tag-list.html

@@ -5,5 +5,5 @@
 
 {% assign keys = tags %}
 {% assign field = 'tags' %}
-{% assign url = '/tags.html' %}
+{% assign url = '/tags.html' | relative_url %}
 {%- include sidebar/common-list.html -%}

data/_includes/views/header.html

@@ -1,13 +1,13 @@
 
 {%- include functions.html func='log' level='debug' msg='Get banner value' -%}
-{% assign name = 'banner' %}
+{%- assign name = 'banner' -%}
 {%- include functions.html func='get_value' -%}
 {% assign banner = return %}
 
 {%- include functions.html func='log' level='debug' msg='Get header_transparent value' -%}
-{% assign name = 'header_transparent' %}
-{%- include functions.html func='get_value' -%}
-{% assign header_transparent = return | default: true %}
+{%- assign name = 'header_transparent' -%}
+{%- include functions.html func='get_value' default=true -%}
+{%- assign header_transparent = return -%}
 
 {%- if banner and header_transparent -%}
   {%- assign header_transparent_class = "site-header-transparent" -%}

data/_includes/views/paginator.html

@@ -6,7 +6,7 @@
   <div class="paginator">
     <span class="previous">
     {% if paginator.previous_page %}
-      <a href="{{ paginator.previous_page_path }}">Prev</a>
+      <a href="{{ paginator.previous_page_path | relative_url }}">Prev</a>
     {% else %}
       <span>Prev</span>
     {% endif %}
@@ -16,7 +16,7 @@
 
     <span class="next">
     {% if paginator.next_page %}
-      <a href="{{ paginator.next_page_path }}">Next</a>
+      <a href="{{ paginator.next_page_path | relative_url }}">Next</a>
     {% else %}
       <span>Next</span>
     {% endif %}

data/_includes/views/post-header.html

@@ -17,7 +17,7 @@
   {%- if page.tags.size > 0 -%}
   <div class="post-tags">
     {%- for tag in page.tags -%}
-    <a class="post-tag" href="/tags.html#{{tag}}">#{{tag}}</a>
+    <a class="post-tag" href="{{ '/tags.html ' | relative_url }}#{{tag}}">#{{tag}}</a>
     {%- endfor -%}
   </div>
   {%- endif -%}

data/_layouts/404.html

@@ -7,7 +7,6 @@ layout: default
     margin: 10px auto;
     max-width: 600px;
     text-align: center;
-    color: #3c3c3c;
   }
   h1 {
     margin: 30px 0;

data/_layouts/default.html

@@ -11,6 +11,8 @@
 
     {%- include extensions/hashlocate.html -%}
 
+    {%- include extensions/theme-toggle.html -%}
+
     <main class="page-content" aria-label="Content">
       <div class="wrapper">
         {{ content }}

data/_sass/misc/common-list.scss

@@ -27,7 +27,7 @@
       transition: background 0.2s;
 
       &:hover {
-        background: mix($theme-color, #eaeaea, 20%);
+        background-color: mix($theme-color, #eaeaea, 20%);
       }
     }
 

data/_sass/misc/google-translate.scss

@@ -113,7 +113,7 @@ body {
 // Main look
 
 .ct-language-selected {
-  background: darken($theme-color, 5%) !important;
+  background-color: darken($theme-color, 5%) !important;
 }
 
 .ct-language-dropdown {

data/_sass/misc/theme-toggle.scss

@@ -0,0 +1,79 @@
+.theme-toggle {
+  position: relative;
+  width: 102px;
+  margin-top: 10px;
+  margin-right: 60px;
+  margin-left: auto;
+  transition: 0.1s all ease-in-out;
+
+  label, .toggle {
+    border-radius: 100px;
+  }
+
+  label {
+    display: block;
+    background-color: rgba(120,120,120,.15);
+    cursor: pointer;
+  }
+
+  .toggle {
+    position: absolute;
+    width: 50%;
+    height: 100%;
+    background-color: #fff;
+    box-shadow: 0 2px 15px rgba(0,0,0,.15);
+    transition: transform .2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  }
+
+  .names {
+    font-size: 1em;
+    font-weight: bolder;
+    width: 76%;
+    margin-left: 12%;
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    user-select: none;
+  }
+
+  .dark {
+    opacity: .5;
+  }
+
+  p {
+    color: #acacac;
+    margin-bottom: 0;
+    line-height: 24px;
+  }
+
+  [type="checkbox"] {
+    display: none;
+  }
+
+  /* Toggle */
+  [type="checkbox"]:checked ~ label .toggle {
+    transform: translateX(100%);
+    background-color: #34323D;
+  }
+
+  [type="checkbox"]:checked ~ label .dark{
+    opacity: 1;
+  }
+
+  [type="checkbox"]:checked ~ label .light{
+    opacity: .5;
+  }
+
+  @include media-query(1024px) {
+    margin-right: 35px;
+  }
+
+  @include media-query($on-palm) {
+    width: 94px;
+    margin-right: 20px;
+
+    .names {
+      font-size: .85em;
+    }
+  }
+}

data/_sass/yat.scss

@@ -61,7 +61,8 @@ $on-laptop:        800px !default;
 @import
   "yat/base",
   "yat/layout",
-  // "yat/syntax-highlighting",
+  "yat/dark",
+  "misc/theme-toggle",
   "misc/article-menu",
   "misc/common-list",
   "misc/google-translate"

data/_sass/yat/_base.scss

@@ -151,7 +151,8 @@ code {
   padding: 1px 5px;
   border-radius: 3px;
   color: #fff;
-  background-color: #545454;
+  background-color: #787878;
+  margin: 0 5px;
 }
 
 pre {

data/_sass/yat/_dark.scss

@@ -0,0 +1,184 @@
+$dark-background-color:       #0e0e0e !default;
+
+html[data-theme="dark"]  {
+
+  &[data-scroll-status='top'] {
+    .site-footer-inner {
+      border-top: solid 1px #2f2f2f !important;
+      transition: 0s;
+    }
+  }
+
+  body {
+    color: #bbb;
+    background-color: $dark-background-color;
+  }
+
+  *:not(pre) > code {
+    background-color: #545454;
+  }
+
+  table {
+    color: #9d9d9d;
+
+    th {
+      background-color: #000;
+    }
+
+    tr:nth-child(even) {
+      background-color: #111;
+    }
+  }
+
+  .site-header {
+    background-color: #090909;
+
+    .site-brand {
+      .site-brand-inner {
+        &, &:visited {
+          color: #f8f8f8;
+        }
+      }
+    }
+
+    .site-nav .page-link {
+      color: #f8f8f8;
+    }
+
+    .ct-language-dropdown {
+      color: #f8f8f8;
+      background-color: $dark-background-color;
+    }
+
+    .ct-language-selected, .ct-language-dropdown li:hover {
+      background-color: #222 !important;
+    }
+  }
+
+  .site-footer {
+    color: #fff;
+    background-color: #000;
+  }
+
+  .left-vsplit:before {
+    background-color: #9a9a9a;
+  }
+
+  .page-banner {
+    .page-banner-img {
+      & > *:first-child {
+        opacity: 0.8;
+      }
+    }
+  }
+
+  .pagination {
+    .post-link {
+      color: #bbb;
+    }
+
+    .post-title {
+      a:visited:after {
+        background-color: $dark-background-color;
+      }
+
+      a:after {
+        color: $dark-background-color;
+      }
+    }
+
+    .post-list {
+      & > li:not(:last-child) {
+        border-bottom: 1px solid #545454;
+      }
+    }
+
+    .post-tags .post-tag:hover {
+      color: #d7d7d7;
+    }
+  }
+
+  .page-segments {
+    li {
+      a {
+        color: #ddd;
+      }
+
+      a:visited:after {
+        background-color: $dark-background-color;
+      }
+
+      a:after {
+        color: $dark-background-color;
+      }
+    }
+  }
+
+  .post .post-content {
+    img:not([raw]) {
+      background-color: #ffffff33;
+    }
+  }
+
+  .post-related {
+    & > *:first-child {
+      color: #d7d7d7;
+    }
+
+    a:visited:after {
+      background-color: $dark-background-color;
+    }
+
+    a:after {
+      color: $dark-background-color;
+    }
+
+    a:hover {
+      color: #aaa;
+    }
+  }
+
+  .common-list {
+    li {
+      border-bottom: solid 1px #40404088;
+
+      a {
+        color: #aaa;
+      }
+
+      a:hover {
+        background-color: #272727;
+      }
+
+      span {
+        background-color: #333;
+      }
+    }
+  }
+
+  .post-menu {
+    .post-menu-title {
+      color: #ddd;
+    }
+
+    .post-menu-content {
+      ul {
+        border-left: 1px solid #787878;
+
+        .active {
+          background-color: #2d2d2d;
+          border-left: 2px solid #aaa;
+        }
+
+        a {
+          color: #bbb;
+        }
+
+        a:hover {
+          color: #fff !important;
+        }
+      }
+    }
+  }
+}
+

data/_sass/yat/_layout.scss

@@ -11,7 +11,7 @@ html {
   &[data-scroll-status='top'] {
     header.site-header-transparent {
       height: 0;
-      margin-top: 20px;
+      margin-top: 12px;
       background-color: transparent;
       transition: 0.1s height,background-color,box-shadow;
 
@@ -244,6 +244,7 @@ html {
   @extend %flex-1; /* <-- Keep footer on the bottom */
   -ms-flex: none; /* <-- Fix IE footer issue */
   padding: $spacing-unit * 2 0;
+  padding-top: 72px;
 }
 
 .page-heading {
@@ -326,7 +327,7 @@ html {
     }
 
     &:hover {
-      color: #777;
+      color: #787878;
     }
   }
 
@@ -359,10 +360,6 @@ html {
       color: #b3b3b3;
     }
 
-    a:hover {
-      color: #000;
-    }
-
     .indicator {
       padding: 0 15px;
     }
@@ -392,6 +389,9 @@ html {
 
   .post-content {
     margin-bottom: $spacing-unit;
+    overflow-wrap: normal;
+    word-wrap: normal;
+    word-break: normal;
 
     h2 {
       @include relative-font-size(2);
@@ -417,7 +417,7 @@ html {
       }
     }
 
-    img, iframe {
+    img, svg, iframe {
       margin-left: auto;
       margin-right: auto;
       display: block;
@@ -557,7 +557,6 @@ html {
   height: $banner-height;
   background-color: $banner-background;
   transition: height 0.2s;
-  margin-bottom: 32px;
 
   .page-banner-img {
     position: absolute;
@@ -567,6 +566,7 @@ html {
 
     & > *:first-child {
       @include center-image;
+      transition: 0.1s all ease-in-out;
     }
   }
 
@@ -587,8 +587,7 @@ html {
       > :nth-child(1) {
         @include relative-font-size(3.9);
         letter-spacing: -1px;
-        line-height: 0.95;
-        margin-bottom: 18px;
+        margin-bottom: 16px;
         font-weight: normal;
         transition: 0.2s all;
 
@@ -611,6 +610,10 @@ html {
       @include relative-font-size(1.525);
       color: #ffffffcc;
       padding-right: 280px;
+
+      @include media-query($on-palm) {
+        padding-right: 0;
+      }
     }
 
     .post-meta {
@@ -625,6 +628,10 @@ html {
       color: #999;
       padding-right: 280px;
 
+      @include media-query($on-palm) {
+        padding-right: 0;
+      }
+
       .post-tag {
         @include relative-font-size(1.125);
         display: inline-block;

data/assets/js/main.js

@@ -58,10 +58,12 @@ function smoothScrollTo(y, time) {
 
 // Init highlight js
 document.addEventListener('DOMContentLoaded', function(event) {
-  document.querySelectorAll('pre code').forEach((block) => {
+  var els = document.querySelectorAll('pre code')
+  function handle(block) {
     var outer = block.parentElement.parentElement.parentElement;
     var lang = block.getAttribute('data-lang');
-    for (var cls of outer.classList) {
+    for (var i = 0; i < outer.classList.length; i++) {
+      var cls = outer.classList[i];
       if (cls.startsWith('language-')) {
         lang = cls;
         break;
@@ -77,5 +79,9 @@ document.addEventListener('DOMContentLoaded', function(event) {
     block.setAttribute('class', 'hljs ' + lang);
     block.parentNode.setAttribute('data-lang', lang);
     hljs.highlightBlock(block);
-  });
+  }
+  for (var i = 0; i < els.length; i++) {
+    var el = els[i];
+    handle(el);
+  }
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-yat
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - jeffreytse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ files:
 - _includes/extensions/google-translate.html
 - _includes/extensions/hashlocate.html
 - _includes/extensions/mathjax.html
+- _includes/extensions/theme-toggle.html
 - _includes/extensions/trianglify.html
 - _includes/functions.html
 - _includes/functions/get_categories.html
@@ -196,8 +197,10 @@ files:
 - _sass/misc/article-menu.scss
 - _sass/misc/common-list.scss
 - _sass/misc/google-translate.scss
+- _sass/misc/theme-toggle.scss
 - _sass/yat.scss
 - _sass/yat/_base.scss
+- _sass/yat/_dark.scss
 - _sass/yat/_layout.scss
 - assets/css/main.scss
 - assets/images/banners/home.jpeg