jekyll-theme-yat 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33ad64189dbb0e80834f1dec85a7327ea7fac4a20dcad45adfac9da1265a2ff6
-  data.tar.gz: e927ef2806d2d939b8c61e3fd0f7247a285d0d1d131177859a6516beba2d225b
+  metadata.gz: 68d64a82d730e3929877098dc29bdc3d970d2288d7d0a6a822bb6ea665cbfc79
+  data.tar.gz: 43f608c27d246a32ccb0ff3d8b6f7cbc28f836d280357e60594b1253a98a8bf5
 SHA512:
-  metadata.gz: 4ff46c013cf3e91f16542c871168641961d0949e0a4afa4112defb1c52a3ccdd76e0986efcab2ca9aa323deb69460dc4e92c8894997b07605395ae296af72ab8
-  data.tar.gz: 64cc10e3dde27ec64395fc0527f10c94f84b1f14b40d455b433faf3ed01c069d8bd3d94bea5471d0604127a27e4db2694920c5a96b77d55d94f39bdd4ce9b1d0
+  metadata.gz: 2c66e47b39750dbf0a1399362a9c04b98c62df4ee0590c2973a4ea6ad80729289e8a311c064ad3458114b9c73b4205ab7f8aa6cea4a7b75441e7f2397e5de2b9
+  data.tar.gz: e752d272ca91ec205e97ac5ea77fab2bc2e007b3ea385612ac94d24546afc6ec3e51aad3571a1fd032b4205d752d0fa55dd206e95e6fed708d519c33f6cbdfd3

data/README.md

@@ -1,15 +1,62 @@
-# jekyll-theme-yat
-[![Github Pages](https://github.com/jeffreytse/jekyll-theme-yat/workflows/Github%20Pages/badge.svg)](https://jeffreytse.github.io/jekyll-theme-yat)
-[![Gem Version](https://badge.fury.io/rb/jekyll-theme-yat.svg)](http://badge.fury.io/rb/jekyll-theme-yat)
-[![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
-[![Donate (Liberapay)](http://img.shields.io/liberapay/goal/jeffreytse.svg?logo=liberapay)](https://liberapay.com/jeffreytse)
-[![Donate (Patreon)](https://img.shields.io/badge/support-patreon-F96854.svg?style=flat-square)](https://patreon.com/jeffreytse)
-<a href="https://ko-fi.com/jeffreytse">
+<div align="center">
+  <br>
+
+  <a href="https://github.com/jeffreytse/jekyll-theme-yat">
+    <img alt="jekyll-theme-yat →~ jekyll" src="https://user-images.githubusercontent.com/9413601/106478481-346fdf00-64e4-11eb-9385-1ab5329c3234.png" width="600">
+  </a>
+
+  <h1>🎨 JEKYLL YAT THEME 🎨</h1>
+
+</div>
+
+<h4 align="center">
+  <a href="https://jekyllrb.com/" target="_blank"><code>Jekyll</code></a> theme for elegant writers.
+</h4>
+
+<p align="center">
+  <a href="https://jeffreytse.github.io/jekyll-theme-yat">
+    <img src="https://github.com/jeffreytse/jekyll-theme-yat/workflows/Github%20Pages/badge.svg"
+      alt="Github Pages" />
+  </a>
+
+  <a href="http://badge.fury.io/rb/jekyll-theme-yat">
+    <img src="https://badge.fury.io/rb/jekyll-theme-yat.svg"
+      alt="Gem Version" />
+  </a>
+
+  <a href="https://opensource.org/licenses/MIT">
+    <img src="https://img.shields.io/badge/License-MIT-brightgreen.svg"
+      alt="License: MIT" />
+  </a>
+
+  <a href="https://liberapay.com/jeffreytse">
+    <img src="http://img.shields.io/liberapay/goal/jeffreytse.svg?logo=liberapay"
+      alt="Donate (Liberapay)" />
+  </a>
+
+  <a href="https://patreon.com/jeffreytse">
+    <img src="https://img.shields.io/badge/support-patreon-F96854.svg?style=flat-square"
+      alt="Donate (Patreon)" />
+  </a>
+
+  <a href="https://ko-fi.com/jeffreytse">
   <img height="20" src="https://www.ko-fi.com/img/githubbutton_sm.svg"
-    alt="Donate (Ko-fi)" />
-</a>
+  alt="Donate (Ko-fi)" />
+  </a>
+</p>
+
+<div align="center">
+  <sub>Built with ❤︎ by
+  <a href="https://jeffreytse.net">jeffreytse</a> and
+  <a href="https://github.com/jeffreytse/jekyll-theme-yat/graphs/contributors">contributors </a>
+</div>
+
+<br>
 
-Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme is a modern theme, and it's quiet clear, clean and neat for writers and posts.
+Hey, nice to meet you, you found this [Jekyll][jekyll] theme. Here the
+**Yet Another Theme** is a modern responsive theme, and it's quiet clear,
+clean and neat for writers and posts. **If you like the theme, give it
+a star!**
 
 
 <p align="center">
@@ -18,7 +65,7 @@ Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme i
 
 </p>
 
-<h3 align="center">Night Mode</h3>
+<h3 align="center">🌌 Night Mode</h3>
 
 <p align="center">
 
@@ -26,12 +73,13 @@ Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme i
 
 </p>
 
-## Features
+## ✨ Features
 
 - Support beautiful __Night Mode__.
+- Modern responsive web design.
 - Full layouts `home`, `post`, `tags`, `archive` and `about`.
 - Uses font awesome 5 for icons.
-- Beautiful Syntax Highlight using [hilight.js][hilight-js].
+- Beautiful Syntax Highlight using [highlight.js][highlight-js].
 - RSS support using [Jekyll Feed][jekyll-feed] gem.
 - Optimized for search engines using [Jekyll Seo Tag][jekyll-seo-tag] gem.
 - Sitemap support using [Jekyll Sitemap][jekyll-sitemap] gem.
@@ -44,7 +92,7 @@ Hey, nice to meet you, you found this Jekyll theme. Here the yet another theme i
 
 Also, visit the [Live Demo][yat-live-demo] site for the theme.
 
-## Installation
+## 🛠️  Installation
 
 There are three ways to install:
 
@@ -103,7 +151,7 @@ And then execute:
 $ bundle
 ```
 
-## GitHub Pages without limitation
+### GitHub Pages without limitation
 
 GitHub Pages runs in `safe` mode and only allows [a set of whitelisted plugins/themes](https://pages.github.com/versions/). __In other words, the third-party gems will not work normally__.
 
@@ -112,11 +160,11 @@ To use the third-party gem in GitHub Pages without limitation:
 Here is a GitHub Action named [jekyll-deploy-action](https://github.com/jeffreytse/jekyll-deploy-action) for Jekyll site deployment conveniently. 👍
 
 
-## Usage
+## 📚 Usage
 
 Add or update your available layouts, includes, sass and/or assets.
 
-## Development
+## ✏️  Development
 
 To set up your environment to develop this theme, run `bundle install`.
 
@@ -125,13 +173,13 @@ Your theme is setup just like a normal Jekyll site! To test your theme, run `bun
 When your theme is released, only the files in `_data`, `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
 To add a custom directory to your theme-gem, please edit the regexp in `jekyll-theme-yat.gemspec` accordingly.
 
-## Contributing
+## 🔫 Contributing
 
 Issues and Pull Requests are greatly appreciated. If you've never contributed to an open source project before I'm more than happy to walk you through how to create a pull request.
 
 You can start by [opening an issue](https://github.com/jeffreytse/jekyll-theme-yat/issues/new) describing the problem that you're looking to resolve and we'll go from there.
 
-## License
+## 🌈 License
 
 This theme is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php) © JeffreyTse.
 
@@ -143,4 +191,4 @@ This theme is licensed under the [MIT license](https://opensource.org/licenses/m
 [jekyll-seo-tag]: https://github.com/jekyll/jekyll-seo-tag
 [jekyll-sitemap]: https://github.com/jekyll/jekyll-sitemap
 [jekyll-feed]: https://github.com/jekyll/jekyll-feed
-[hilight-js]: https://github.com/highlightjs/highlight.js
+[highlight-js]: https://github.com/highlightjs/highlight.js

data/_data/translate_langs.yml

@@ -2,25 +2,25 @@
 # langs refer to https://cloud.google.com/translate/docs/languages
 
 - lang: en
-  img: https://www.countryflags.io/us/flat/64.png
+  img: https://cdn.countryflags.com/thumbs/united-states-of-america/flag-400.png
   text: English
 
 - lang: fr
-  img: https://www.countryflags.io/fr/flat/64.png
-  text: Franch
+  img: https://cdn.countryflags.com/thumbs/france/flag-400.png
+  text: French
 
 - lang: zh-CN
-  img: https://www.countryflags.io/cn/flat/64.png
+  img: https://cdn.countryflags.com/thumbs/china/flag-400.png
   text: Chinese(Simple)
 
 - lang: ja
-  img: https://www.countryflags.io/jp/flat/64.png
-  text: Japan
+  img: https://cdn.countryflags.com/thumbs/japan/flag-400.png
+  text: Japanese
 
 - lang: ko
-  img: https://www.countryflags.io/kr/flat/64.png
+  img: https://cdn.countryflags.com/thumbs/south-korea/flag-400.png
   text: Korean
 
 - lang: ru
-  img: https://www.countryflags.io/ru/flat/64.png
-  text: Russia
+  img: https://cdn.countryflags.com/thumbs/russia/flag-400.png
+  text: Russian

data/_includes/extensions/code-highlight.html

@@ -0,0 +1,91 @@
+<link rel="stylesheet"
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js"></script>
+<!-- and it's easy to individually load additional languages -->
+<script charset="UTF-8"
+        src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
+
+{%- assign name = 'code_badge.enabled' -%}
+{%- include functions.html func='get_value' default='true' -%}
+{%- assign badge_enabled = return -%}
+
+{%- assign name = 'code_badge.color' -%}
+{%- include functions.html func='get_value' default='#fff' -%}
+{%- assign badge_color = return -%}
+
+{%- assign name = 'code_badge.background_color' -%}
+{%- include functions.html func='get_value' default='#ff4e00' -%}
+{%- assign badge_background_color = return -%}
+
+{%- assign name = 'code_badge.text_transform' -%}
+{%- include functions.html func='get_value' default='uppercase' -%}
+{%- assign badge_text_transform = return -%}
+
+<script>
+// Init highlight js
+document.addEventListener('DOMContentLoaded', function(event) {
+  var els = document.querySelectorAll('pre code')
+
+  function addLangData(block) {
+    var outer = block.parentElement.parentElement.parentElement;
+    var lang = block.getAttribute('data-lang');
+    for (var i = 0; i < outer.classList.length; i++) {
+      var cls = outer.classList[i];
+      if (cls.startsWith('language-')) {
+        lang = cls;
+        break;
+      }
+    }
+    if (!lang) {
+      cls = block.getAttribute('class');
+      lang = cls ? cls.replace('hljs ', '') : '';
+    }
+    if (lang.startsWith('language-')) {
+      lang = lang.substr(9);
+    }
+    block.setAttribute('class', 'hljs ' + lang);
+    block.parentNode.setAttribute('data-lang', lang);
+  }
+
+  function addBadge(block) {
+    var enabled = ('{{ badge_enabled }}' || 'true').toLowerCase();
+    if (enabled == 'true') {
+      var pre = block.parentElement;
+      pre.classList.add('badge');
+    }
+  }
+
+  function handle(block) {
+    addLangData(block);
+    addBadge(block)
+    hljs.highlightBlock(block);
+  }
+
+  for (var i = 0; i < els.length; i++) {
+    var el = els[i];
+    handle(el);
+  }
+});
+</script>
+
+<style>
+  /* code language badge */
+  pre.badge::before {
+    content: attr(data-lang);
+    color: {{badge_color}};
+    background-color: {{badge_background_color}};
+    padding: 0 .5em;
+    border-radius: 0 2px;
+    text-transform: {{badge_text_transform}};
+    text-align: center;
+    min-width: 32px;
+    display: inline-block;
+    position: absolute;
+    right: 0;
+  }
+
+  /* fix wrong badge display for firefox browser */
+  code > table pre::before {
+    display: none;
+  }
+</style>

data/_includes/extensions/hashlocate.html

@@ -1,6 +1,7 @@
 <script>
   function hashLocate(hashValue) {
     hashValue = hashValue.replace(/^.*#h-/, '');
+    hashValue = decodeURIComponent(hashValue);
     var element = document.getElementById(hashValue);
 
     if (!element) {

data/_includes/extensions/theme-toggle.html

@@ -17,18 +17,22 @@
   (function() {
     var sw = document.getElementById('theme-switch');
     var html = document.getElementsByTagName('html')[0];
+    var nightModeOption = ('{{ night_mode }}' || 'auto').toLowerCase();
+    var storage = nightModeOption === 'manual'
+        ? localStorage
+        : sessionStorage;
     var themeData = loadThemeData();
 
     function saveThemeData(data) {
-      localStorage.setItem('theme', JSON.stringify(data));
+      storage.setItem('theme', JSON.stringify(data));
     }
 
     function loadThemeData() {
-      var data = localStorage.getItem('theme');
+      var data = storage.getItem('theme');
       try {
         data = JSON.parse(data ? data : '');
       } catch(e) {
-        data = { nightShift: false, autoToggleAt: 0 };
+        data = { nightShift: undefined, autoToggleAt: 0 };
         saveThemeData(data);
       }
       return data;
@@ -81,9 +85,6 @@
       handleThemeToggle(event.target.checked);
     });
 
-    var nightModeOption = '{{ night_mode }}';
-    nightModeOption = nightModeOption.toLowerCase();
-
     if (nightModeOption == 'auto') {
       var data = autoThemeToggle();
 
@@ -94,10 +95,14 @@
       } else {
         handleThemeToggle(themeData.nightShift);
       }
-    } else if (nightModeOption == 'mannual') {
+    } else if (nightModeOption == 'manual') {
       handleThemeToggle(themeData.nightShift);
     } else {
-      handleThemeToggle(nightModeOption == 'on');
+      var nightShift = themeData.nightShift;
+      if (nightShift === undefined) {
+        nightShift = nightModeOption === 'on';
+      }
+      handleThemeToggle(nightShift);
     }
   })();
 </script>

data/_includes/functions.html

@@ -16,6 +16,10 @@
   {%- include {{ include_path }} params=params-%}
 {%- endif -%}
 
+{%- if return == nil -%}
+  {%- assign return = include.default -%}
+{%- endif -%}
+
 {%- if func != 'log' -%}
   {%- assign msg = '[function]['
     | append: {{func}}

data/_includes/functions/get_article_excerpt.html

@@ -0,0 +1,39 @@
+{% if include.params.article %}
+  {% assign article = include.params.article %}
+{% endif %}
+
+{% if include.params.lang %}
+  {% assign lang = include.params.lang %}
+{% else %}
+  {% assign lang = lang | default: site.lang | default: "en" %}
+{% endif %}
+
+{% if include.params.excerpt_size %}
+  {% assign excerpt_size = include.params.excerpt_size %}
+{% else %}
+  {% assign excerpt_size = excerpt_size
+    | default: site.excerpt_size
+    | default: 350 %}
+{% endif %}
+
+{%- include functions.html func='get_article_words' -%}
+{% assign words = return %}
+
+{% assign _article = article | strip_html %}
+{% assign _words = _article | size %}
+
+{% assign _size = excerpt_size %}
+
+{% if lang != "en" %}
+  {% assign _size = words
+    | times: 1.0
+    | divided_by: _words
+    | times: _size
+    | round %}
+{% endif %}
+
+{% if _size > excerpt_size %}
+  {% assign _size = excerpt_size %}
+{% endif %}
+
+{% assign return = _article | truncate: _size %}

data/_includes/functions/get_article_words.html

@@ -0,0 +1,26 @@
+{% if include.params.article %}
+  {% assign article = include.params.article %}
+{% endif %}
+
+{% if include.params.lang %}
+  {% assign lang = include.params.lang %}
+{% else %}
+  {% assign lang = lang | default: site.lang | default: "en" %}
+{% endif %}
+
+{% assign words = article | number_of_words %}
+
+{% if lang != "en" %}
+  {% assign words = words
+    | times: 0.6
+    | round %}
+  {% assign words = article
+    | strip_html
+    | strip_newlines
+    | size
+    | times: 0.4
+    | plus: words
+    | round %}
+{% endif %}
+
+{% assign return = words %}

data/_includes/functions/get_banner.html

@@ -0,0 +1,68 @@
+{%- include functions.html func='log' level='debug' msg='Get banner value' -%}
+{% assign name = 'banner' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner = return %}
+
+{%- if banner.first -%}
+  {%- include functions.html func='log' level='debug' msg='Get banner_image value' -%}
+  {% assign name = 'banner.image' %}
+  {%- include functions.html func='get_value' -%}
+  {% assign banner_image = return | relative_url %}
+{%- else -%}
+  {% assign banner_image = banner | relative_url %}
+{%- endif -%}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_background value' -%}
+{% assign name = 'banner.background' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_background = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_opacity value' -%}
+{% assign name = 'banner.opacity' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_opacity = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_height value' -%}
+{% assign name = 'banner.height' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_height = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_min_height value' -%}
+{% assign name = 'banner.min_height' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_min_height = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_heading_style value' -%}
+{% assign name = 'banner.heading_style' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_heading_style = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_subheading_style value' -%}
+{% assign name = 'banner.subheading_style' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_subheading_style = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_video value' -%}
+{% assign name = 'banner.video' %}
+{%- include functions.html func='get_value' -%}
+{% assign banner_video = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_loop value' -%}
+{% assign name = 'banner.loop' %}
+{%- include functions.html func='get_value' default=true -%}
+{% assign banner_loop = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_volume value' -%}
+{% assign name = 'banner.volume' %}
+{%- include functions.html func='get_value' default=0 -%}
+{% assign banner_volume = return %}
+
+{%- include functions.html func='log' level='debug' msg='Get banner_start_at value' -%}
+{% assign name = 'banner.start_at' %}
+{%- include functions.html func='get_value' default=0 -%}
+{% assign banner_start_at = return %}
+
+{% if banner_image or banner_video %}
+  {% assign has_banner = true %}
+{% endif %}
+

data/_includes/functions/get_reading_time.html

@@ -2,14 +2,22 @@
   {% assign article = include.params.article %}
 {% endif %}
 
+{% if include.params.lang %}
+  {% assign lang = include.params.lang %}
+{% else %}
+  {% assign lang = lang | default: site.lang | default: "en" %}
+{% endif %}
+
 {% if include.params.speed %}
   {% assign speed = include.params.speed %}
 {% else %}
   {% assign speed = 160 %}
 {% endif %}
 
-{% assign total_mins = article
-  | number_of_words
+{%- include functions.html func='get_article_words' -%}
+{% assign words = return %}
+
+{% assign total_mins = words
   | divided_by: speed
   | at_least: 1 %}
 

data/_includes/functions/get_value.html

@@ -2,18 +2,41 @@
   {%- assign name = include.params.name -%}
 {%- endif -%}
 
-{%- if page[name] != nil -%}
-  {%- assign return = page[name] -%}
-{%- elsif site[name] != nil -%}
-  {%- assign return = site[name] -%}
-{%- elsif site.data[name] != nil -%}
-  {%- assign return = site.data[name] -%}
-{%- elsif site.defaults[page.layout][name] != nil -%}
-  {%- assign return = site.defaults[page.layout][name] -%}
-{%- elsif site.data.defaults[page.layout][name] != nil -%}
-  {%- assign return = site.data.defaults[page.layout][name] -%}
-{%- elsif layout[name] != nil -%}
-  {%- assign return = layout[name] -%}
-{%- else -%}
-  {%- assign return = include.params.default -%}
-{%- endif -%}
+{%- assign return = nil -%}
+
+{%- assign keys = name | split:'.' -%}
+{%- assign name = keys.first -%}
+{%- assign keys = keys | shift -%}
+
+{%- for step in (1..7) -%}
+
+  {%- case step -%}
+    {%- when 1 -%}
+      {%- assign return = page[name] -%}
+    {%- when 2 -%}
+      {%- assign return = site[name] -%}
+    {%- when 3 -%}
+      {%- assign return = site.data[name] -%}
+    {%- when 4 -%}
+      {%- assign return = site.defaults[page.layout][name] -%}
+    {%- when 5 -%}
+      {%- assign return = site.data.defaults[page.layout][name] -%}
+    {%- when 6 -%}
+      {%- assign return = layout[name] -%}
+    {%- else -%}
+      {%- assign return = include.params.default -%}
+  {%- endcase -%}
+
+  {%- for key in keys -%}
+    {%- assign return = return[key] -%}
+    {%- if return == nil -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+
+  {%- if return != nil -%}
+    {%- break -%}
+  {%- endif -%}
+
+{%- endfor -%}
+

data/_includes/head.html

@@ -7,16 +7,11 @@
   <link rel="shortcut icon" href="{{ site.favicon }}">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/typeface-noto-sans@0.0.72/index.min.css">
-  <link rel="stylesheet"
-        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/default.min.css">
-  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js"></script>
-  <!-- and it's easy to individually load additional languages -->
-  <script charset="UTF-8"
-          src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
   <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}">
   <script src="{{ "/assets/js/main.js" | relative_url }}"></script>
   {%- feed_meta -%}
   {%- if jekyll.environment == 'production' and site.google_analytics -%}
   {%- include extensions/google-analytics.html -%}
   {%- endif -%}
+  {%- include extensions/code-highlight.html -%}
 </head>

data/_includes/views/banner.html

@@ -3,11 +3,6 @@
 {%- include functions.html func='get_value' -%}
 {% assign banner_html = return %}
 
-{%- include functions.html func='log' level='debug' msg='Get banner value' -%}
-{% assign name = 'banner' %}
-{%- include functions.html func='get_value' -%}
-{% assign banner = return %}
-
 {%- include functions.html func='log' level='debug' msg='Get heading value' -%}
 {% assign name = 'heading' %}
 {%- include functions.html func='get_value' -%}
@@ -18,10 +13,96 @@
 {%- include functions.html func='get_value' -%}
 {% assign subheading = return %}
 
-{% if banner %}
+{%- include functions.html func='get_banner' -%}
+
+{%- if has_banner -%}
+  {%- if banner_background -%}
+  <style>
+    html .page-banner {
+      background: {{ banner_background }};
+    }
+  </style>
+  {%- endif -%}
+  {%- if banner_height -%}
+  <style>
+    {%- assign num = banner_height | times: 1 -%}
+    {%- assign unit = banner_height | replace_first: num -%}
+    {%- assign banner_min_height = banner_min_height | default: banner_height -%}
+    html .page-banner {
+      height:  {{ banner_height | times: 0.368 | append: unit }};
+      min-height: {{ banner_min_height }};
+    }
+    html[data-scroll-status="top"] .page-banner {
+      height: {{ banner_height }};
+    }
+  </style>
+  {%- endif -%}
+
+  {%- if banner_opacity -%}
+  <style>
+    html .page-banner .page-banner-img > *:first-child {
+      opacity: {{ banner_opacity }};
+    }
+
+    html[data-theme="dark"] .page-banner .page-banner-img > *:first-child {
+      opacity: {{ banner_opacity | times: 0.718 }};
+    }
+  </style>
+  {%- endif -%}
+  {%- if banner_heading_style -%}
+  <style>
+    html .page-banner .page-banner-inner > *:first-child > *:nth-child(1) {
+      {{ banner_heading_style }}
+    }
+  </style>
+  {%- endif -%}
+  {%- if banner_subheading_style -%}
+  <style>
+    html .page-banner .page-banner-inner > *:first-child > *:nth-child(2) {
+      {{ banner_subheading_style }}
+    }
+  </style>
+  {%- endif -%}
   <section class="page-banner">
     <div class="page-banner-img">
-      <div style="background-image: url({{ banner | relative_url }})"></div>
+      {%- if banner_video -%}
+        <video
+          autoplay=""
+          poster="{{ banner_image }}"
+          playsinline
+        >
+          <source src="{{ banner_video }}">
+        </video>
+        <script>
+          (function() {
+            var video = document.querySelector('.page-banner .page-banner-img > video');
+            var videoPlay = function() {
+              video.play().catch (function() {
+                  video.muted = true;
+                  video.play();
+                });
+            }
+
+            video.onloadstart = function() {
+              video.currentTime = {{ banner_start_at }};
+              video.volume = {{ banner_volume }};
+              video.muted = (video.volume == 0);
+              videoPlay();
+            }
+
+            video.onended = function() {
+              video.currentTime = {{ banner_start_at }};
+              video.volume = 0;
+            {%- if banner_loop -%}
+              video.play();
+            {%- endif -%}
+            }
+          })();
+        </script>
+      {%- else -%}
+        <div style="background-image: url({{ banner_image }})"></div>
+        <img class="img-placeholder" src="{{ banner_image }}">
+      {%- endif -%}
     </div>
     <div class="wrapper">
       <div class="page-banner-inner">

data/_includes/views/footer.html

@@ -3,7 +3,7 @@
 
   <div class="wrapper">
     <div class="site-footer-inner">
-      <div>{{ site.copyright }} @{{ site.author | escape }}</div>
+      <div>{{ site.copyright }} {% if site.author %}@{{ site.author | escape }}{% endif %}</div>
       <div>Powered by <a title="Jekyll is a simple, blog-aware, static site
       generator." href="http://jekyllrb.com/">Jekyll</a> &amp; <a title="Yat, yet
       another theme." href="https://github.com/jeffreytse/jekyll-theme-yat">Yat Theme</a>.</div>

data/_includes/views/header.html

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

data/_includes/views/pagination.html

@@ -13,11 +13,14 @@
       {%- assign date_format = site.yat.date_format | default: "%b %-d, %Y" -%}
 
       {% assign article = post.content %}
+      {% assign lang = post.lang %}
       {%- include functions.html func='get_reading_time' -%}
       {% assign reading_time = return %}
+      {%- include functions.html func='get_article_excerpt' -%}
+      {% assign excerpt = return %}
+      {%- assign post_url = post.url | relative_url -%}
 
       <h2 class="post-title">
-        {%- assign post_url = post.url | relative_url -%}
         <a class="post-link" href="{{ post_url }}">
           {{ post.title | escape }}
         </a>
@@ -26,12 +29,14 @@
         <span class="post-date"><i class="fa fa-calendar"></i> {{ post.date | date: date_format }}</span>
         <span class="post-reading-time left-vsplit"><i class="fa fa-clock-o"></i> {{ reading_time }}</span>
       </div>
-      <p class="post-excerpt">
-        {{ post.content | strip_html | truncatewords: 50 }}
-      </p>
+      <a class="post-excerpt" href="{{ post_url }}">
+        <p>
+        {{ excerpt }} <span class="read_more">Read More</span>
+        </p>
+      </a>
       <div class="post-tags">
         {%- for tag in post.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>
     </li>

data/_includes/views/post-header.html

@@ -1,6 +1,6 @@
 <header class="post-header">
   <h1 class="post-title p-name" itemprop="name headline">{{ heading | default: page.title | escape }}</h1>
-  <h3 class="post-subtitle">{{ subheading | default: page.subtitle | escape }}</h3>
+  <h2 class="post-subtitle">{{ subheading | default: page.subtitle | escape }}</h2>
 
   <p class="post-meta">
     <time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
@@ -9,6 +9,7 @@
     </time>
 
     {% assign article = page.content %}
+    {% assign lang = page.lang %}
     {%- include functions.html func='get_reading_time' -%}
     {% assign reading_time = return %}
     <span class="post-reading-time left-vsplit"><i class="fa fa-clock-o"></i> {{ reading_time }}</span>

data/_sass/misc/gitment.scss

@@ -0,0 +1,16 @@
+.gitment-container {
+  color: #787878 !important;
+}
+
+.gitment-editor-header {
+  background-color: #fefefe;
+}
+
+.gitment-comment-main, .gitment-editor-main {
+  background-color: #fff;
+  border-radius: 3px !important;
+}
+
+.gitment-heart-icon {
+  fill: #ff0808;
+}

data/_sass/misc/theme-toggle.scss

@@ -1,10 +1,10 @@
 .theme-toggle {
   position: relative;
-  width: 102px;
+  width: $base-font-size * 7.65;
   margin-top: 10px;
   margin-right: 60px;
   margin-left: auto;
-  transition: 0.1s all ease-in-out;
+  transition: .3s cubic-bezier(.4,.03,0,1);
 
   label, .toggle {
     border-radius: 100px;
@@ -69,7 +69,7 @@
   }
 
   @include media-query($on-palm) {
-    width: 94px;
+    width: $base-font-size * 6.65;
     margin-right: 20px;
 
     .names {

data/_sass/yat.scss

@@ -2,7 +2,7 @@
 
 // Define defaults for each variable.
 
-$base-font-family: "Noto Sans Light", AppleSDGothicNeo-Regular, "Malgun Gothic", "Apple Color Emoji", Helvetica, Arial, Oswald, sans-serif, !default;
+$base-font-family: Helvetica, Arial, Oswald, sans-serif, !default;
 $base-font-size: 14px !default;
 $base-font-weight: 400 !default;
 $small-font-size:  $base-font-size * 0.875 !default;
@@ -10,9 +10,8 @@ $base-line-height: 1.6 !default;
 
 $spacing-unit:     30px !default;
 
-$text-color:       #313b3f !default;
+$text-color:       #454545 !default;
 $background-color: #fff !default;
-$brand-color:      #ff5100 !default;
 
 $grey-color:       #828282 !default;
 $grey-color-light: lighten($grey-color, 40%) !default;
@@ -65,5 +64,6 @@ $on-laptop:        800px !default;
   "misc/theme-toggle",
   "misc/article-menu",
   "misc/common-list",
-  "misc/google-translate"
+  "misc/google-translate",
+  "misc/gitment"
 ;

data/_sass/yat/_base.scss

@@ -148,10 +148,9 @@ code {
 }
 
 *:not(pre) > code {
-  padding: 1px 5px;
+  padding: 3px 6px;
   border-radius: 3px;
-  color: #fff;
-  background-color: #787878;
+  background-color: #eee;
   margin: 0 5px;
 }
 
@@ -160,21 +159,6 @@ pre {
   position: relative;
   background-color: #f0f0f0;
 
-  // code language badge
-  &:before {
-    content: attr(data-lang);
-    color: #fff;
-    background-color: #ff4e00;
-    padding: 0 .5em;
-    border-radius: 0 2px;
-    text-transform: uppercase;
-    text-align: center;
-    min-width: 32px;
-    display: inline-block;
-    position: absolute;
-    right: 0;
-  }
-
   > code {
     display: inline-block;
     padding: 20px!important;
@@ -221,11 +205,13 @@ pre {
  * Tables
  */
 table {
+  display: block;
   margin-bottom: $spacing-unit;
   width: 100%;
   text-align: $table-text-align;
   color: lighten($text-color, 5%);
   border-collapse: collapse;
+  overflow: auto;
 
   tr {
     &:nth-child(even) {

data/_sass/yat/_dark.scss

@@ -1,32 +1,49 @@
 $dark-background-color:       #0e0e0e !default;
+$dark-text-color: #bbb !default;
 
 html[data-theme="dark"]  {
-
   &[data-scroll-status='top'] {
-    .site-footer-inner {
-      border-top: solid 1px #2f2f2f !important;
-      transition: 0s;
+    header.site-header-transparent {
+      &.site-header {
+        @include media-query($on-laptop) {
+          .page-link {
+            color: #f8f8f8;
+          }
+        }
+      }
+    }
+
+    footer.site-footer {
+      .site-footer-inner {
+        border-top: solid 1px #2f2f2f !important;
+        transition: 0s;
+      }
     }
   }
 
   body {
-    color: #bbb;
+    color: $dark-text-color;
     background-color: $dark-background-color;
   }
 
   *:not(pre) > code {
-    background-color: #545454;
+    color: $dark-text-color;
+    background-color: #454545;
+  }
+
+  blockquote {
+    border-left: 4px solid #484848;
   }
 
   table {
     color: #9d9d9d;
 
     th {
-      background-color: #000;
+      background-color: #050505;
     }
 
     tr:nth-child(even) {
-      background-color: #111;
+      background-color: #080808;
     }
   }
 
@@ -48,11 +65,22 @@ html[data-theme="dark"]  {
     .ct-language-dropdown {
       color: #f8f8f8;
       background-color: $dark-background-color;
+      box-shadow: 0 0 3px 1px #0000005b;
     }
 
     .ct-language-selected, .ct-language-dropdown li:hover {
       background-color: #222 !important;
     }
+
+    @include media-query($on-laptop) {
+      .menu-icon > svg {
+          fill: rgba($dark-text-color, 80%);
+      }
+
+      .site-nav input:checked ~ .trigger {
+        background-color: #090909;
+      }
+    }
   }
 
   .site-footer {
@@ -67,14 +95,14 @@ html[data-theme="dark"]  {
   .page-banner {
     .page-banner-img {
       & > *:first-child {
-        opacity: 0.8;
+        opacity: 0.718;
       }
     }
   }
 
   .pagination {
     .post-link {
-      color: #bbb;
+      color: $dark-text-color;
     }
 
     .post-title {
@@ -171,7 +199,7 @@ html[data-theme="dark"]  {
         }
 
         a {
-          color: #bbb;
+          color: $dark-text-color;
         }
 
         a:hover {

data/_sass/yat/_layout.scss

@@ -23,7 +23,7 @@ html {
 
         @include media-query($on-laptop) {
           .page-link {
-            color: unset;
+            color: $header-text-color;
           }
 
           .menu-icon {
@@ -36,6 +36,7 @@ html {
     }
 
     footer.site-footer {
+      color: unset;
       background-color: transparent;
 
       .site-footer-inner {
@@ -228,10 +229,10 @@ html {
   }
 
   .post-tags {
-    display: inline-block;
     padding-right: 150px;
 
     .post-tag {
+      display: inline-block;
       margin: 0 12px 0 0;
     }
   }
@@ -274,7 +275,7 @@ html {
   }
 
   .post-title {
-    margin-bottom: 2px;
+    margin-bottom: $spacing-unit * 0.2;
     transition: 0.2s all;
 
     a {
@@ -306,9 +307,9 @@ html {
   }
 
   .post-link {
-    @include relative-font-size(1.5);
+    @include relative-font-size(1.65);
     font-weight: $base-font-weight * 1.5;
-    color: #15171a;
+    color: #333;
   }
 
   .post-excerpt {
@@ -379,7 +380,11 @@ html {
     border-bottom: 1px solid #ebebeb;
 
     .post-title {
-      margin-bottom: 2px;
+      margin-bottom: 6px;
+    }
+
+    .post-subtitle {
+      font-weight: lighter;
     }
 
     .post-meta {
@@ -497,6 +502,7 @@ html {
     @include relative-font-size(1.125);
     line-height: 15px;
     color: #666;
+    max-width: 50%;
   }
 
   .previous:before {
@@ -568,6 +574,15 @@ html {
       @include center-image;
       transition: 0.1s all ease-in-out;
     }
+
+    & > video {
+      width: 100vw;
+      object-fit: cover;
+    }
+
+    & > img.img-placeholder {
+      display: none;
+    }
   }
 
   .wrapper {
@@ -587,18 +602,23 @@ html {
       > :nth-child(1) {
         @include relative-font-size(3.9);
         letter-spacing: -1px;
-        margin-bottom: 16px;
+        margin-bottom: 0.1em;
         font-weight: normal;
         transition: 0.2s all;
 
         @include media-query($on-palm) {
-          @include relative-font-size(2.425);
+          @include relative-font-size(1.975);
         }
       }
 
       > :nth-child(2) {
-        font-weight: normal;
-        margin-bottom: 0;
+        font-weight: lighter;
+        margin-bottom: 0.8em;
+        transition: 0.2s all;
+
+        @include media-query($on-palm) {
+          @include relative-font-size(1.175);
+        }
       }
 
       > :last-child {

data/assets/css/main.scss

@@ -4,13 +4,22 @@
 
 // Default theme colors
 $theme-colors: (
-  coolblack: #090a0b,
-  spacegrey: #353535,
-  snowwhite: #ffffff,
+  "coolblack": #090a0b,
+  "spacegrey": #353535,
+  "snowwhite": #ffffff,
+);
+
+// Default brand colors
+$brand-colors: (
+  "orangered": #ff5100,
+  "greatgold": #f2cb05,
+  "greenblue": #389092,
 );
 
 $theme-name: "{{ site.theme_color }}";
+$brand-name: "{{ site.brand_color }}";
 $theme-color: map-get($theme-colors, "snowwhite");
+$brand-color: map-get($brand-colors, "orangered");
 
 @if map-has-key($theme-colors, $theme-name) {
   $theme-color: map-get($theme-colors, $theme-name);
@@ -18,4 +27,10 @@ $theme-color: map-get($theme-colors, "snowwhite");
   $theme-color: {{ site.theme_color | default: '#ffffff' }};
 }
 
+@if map-has-key($brand-colors, $brand-name) {
+  $brand-color: map-get($brand-colors, $brand-name);
+} @else if str-index($brand-name, "#") == 1 {
+  $brand-color: {{ site.brand_color | default: '#ff5100' }};
+}
+
 @import "yat";

data/assets/js/main.js

@@ -56,32 +56,3 @@ function smoothScrollTo(y, time) {
   }
 }
 
-// Init highlight js
-document.addEventListener('DOMContentLoaded', function(event) {
-  var els = document.querySelectorAll('pre code')
-  function handle(block) {
-    var outer = block.parentElement.parentElement.parentElement;
-    var lang = block.getAttribute('data-lang');
-    for (var i = 0; i < outer.classList.length; i++) {
-      var cls = outer.classList[i];
-      if (cls.startsWith('language-')) {
-        lang = cls;
-        break;
-      }
-    }
-    if (!lang) {
-      cls = block.getAttribute('class');
-      lang = cls ? cls.replace('hljs ', '') : '';
-    }
-    if (lang.startsWith('language-')) {
-      lang = lang.substr(9);
-    }
-    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.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - jeffreytse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-10 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - README.md
 - _data/defaults.yml
 - _data/translate_langs.yml
+- _includes/extensions/code-highlight.html
 - _includes/extensions/comments/disqus.html
 - _includes/extensions/comments/gitment.html
 - _includes/extensions/geopattern.html
@@ -161,6 +162,9 @@ files:
 - _includes/extensions/theme-toggle.html
 - _includes/extensions/trianglify.html
 - _includes/functions.html
+- _includes/functions/get_article_excerpt.html
+- _includes/functions/get_article_words.html
+- _includes/functions/get_banner.html
 - _includes/functions/get_categories.html
 - _includes/functions/get_datetimes.html
 - _includes/functions/get_reading_time.html
@@ -196,6 +200,7 @@ files:
 - _layouts/tags.html
 - _sass/misc/article-menu.scss
 - _sass/misc/common-list.scss
+- _sass/misc/gitment.scss
 - _sass/misc/google-translate.scss
 - _sass/misc/theme-toggle.scss
 - _sass/yat.scss
@@ -225,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.19
 signing_key:
 specification_version: 4
 summary: Yet another theme for elegant writers with modern flat style and beautiful