diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 15a0e780bf9..ad5aa9986b1 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -10,4 +10,3 @@ liberapay: jeffreytse
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
-
diff --git a/.github/workflows/build-jekyll.yml b/.github/workflows/build-jekyll.yml
index 9528f5967e2..9066f834182 100644
--- a/.github/workflows/build-jekyll.yml
+++ b/.github/workflows/build-jekyll.yml
@@ -1,33 +1,33 @@
name: Github Pages
on:
- push:
- branches:
- - master # Here source code branch is `master`, it could be other branch
+ push:
+ branches:
+ - master # Here source code branch is `master`, it could be other branch
jobs:
- build_and_deploy:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
+ build_and_deploy:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
- # Use GitHub Actions' cache to cache dependencies on servers
- - uses: actions/cache@v1
- with:
- path: vendor/bundle
- key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
- restore-keys: |
- ${{ runner.os }}-gems-
+ # Use GitHub Actions' cache to cache dependencies on servers
+ - uses: actions/cache@v1
+ with:
+ path: vendor/bundle
+ key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-gems-
- # Use GitHub Deploy Action to build and deploy to Github
- - uses: jeffreytse/jekyll-deploy-action@master
- with:
- provider: 'github'
- token: ${{ secrets.GITHUB_TOKEN }} # It's your Personal Access Token(PAT)
- repository: '' # Default is current repository
- branch: 'gh-pages' # Default is gh-pages for github provider
- jekyll_src: './' # Default is root directory
- jekyll_cfg: '_config.yml' # Default is _config.yml
- jekyll_baseurl: '/jekyll-theme-yat' # Default is empty
- cname: '' # Default is to not use a cname
- actor: '' # Default is the GITHUB_ACTOR
+ # Use GitHub Deploy Action to build and deploy to Github
+ - uses: jeffreytse/jekyll-deploy-action@master
+ with:
+ provider: "github"
+ token: ${{ secrets.GITHUB_TOKEN }} # It's your Personal Access Token(PAT)
+ repository: "" # Default is current repository
+ branch: "gh-pages" # Default is gh-pages for github provider
+ jekyll_src: "./" # Default is root directory
+ jekyll_cfg: "_config.yml" # Default is _config.yml
+ jekyll_baseurl: "/jekyll-theme-yat" # Default is empty
+ cname: "" # Default is to not use a cname
+ actor: "" # Default is the GITHUB_ACTOR
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
new file mode 100644
index 00000000000..6d6fe82c2f0
--- /dev/null
+++ b/.github/workflows/pre-commit.yaml
@@ -0,0 +1,15 @@
+name: pre-commit action
+
+on:
+ pull_request:
+ branches: [main, develop]
+ push:
+ branches: [main, develop]
+
+jobs:
+ pre-commit:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v3
+ - uses: pre-commit/action@v3.0.0
diff --git a/.gitignore b/.gitignore
index 867d3792d5a..9e67f779684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
+# Jekyll
*.gem
.bundle
.sass-cache
_site
Gemfile.lock
+
+# Node
+node_modules/
+package-lock.json
+package.json
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000000..62a81969659
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,14 @@
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v2.3.0
+ hooks:
+ - id: check-yaml
+ - id: end-of-file-fixer
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+ - id: check-merge-conflict
+
+ - repo: https://github.com/pre-commit/mirrors-prettier
+ rev: v3.1.0
+ hooks:
+ - id: prettier
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000000..4a56d8c3064
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+assets/css/main.scss
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
new file mode 100644
index 00000000000..8d0a532c8dd
--- /dev/null
+++ b/.prettierrc.yaml
@@ -0,0 +1,5 @@
+# .prettierrc or .prettierrc.yaml
+trailingComma: "es5"
+tabWidth: 4
+semi: false
+singleQuote: false
diff --git a/Gemfile b/Gemfile
index c031e2a52f7..bb94df82938 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,3 @@
source "https://rubygems.org"
gemspec
-
diff --git a/README.md b/README.md
index 5754a1d2ceb..5cc3905760f 100644
--- a/README.md
+++ b/README.md
@@ -80,23 +80,23 @@ I will respect your crucial support and say THANK YOU!
## Features
-- Support beautiful **Night Mode**.
-- Modern responsive web design.
-- Full layouts `home`, `post`, `tags`, `archive` and `about`.
-- Uses font awesome 5 for icons.
-- Beautiful page banner with image and video.
-- Beautiful Syntax Highlight using [highlight.js][highlight-js].
-- Beautiful image gallery previewer using [PhotoSwipe 5][photoswipe-5].
-- 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.
-- Complex and flexible table support using [Jekyll Spaceship][jekyll-spaceship] gem.
-- MathJAX and LaTeX optional support using [Jekyll Spaceship][jekyll-spaceship] gem.
-- Media (Youtube, Spotify, etc.) support using [Jekyll Spaceship][jekyll-spaceship] gem.
-- Diagram (PlantUML, Mermaid) support using [Jekyll Spaceship][jekyll-spaceship] gem.
-- Google Translation support.
-- New post tag support.
-- Pin post tag support.
+- Support beautiful **Night Mode**.
+- Modern responsive web design.
+- Full layouts `home`, `post`, `tags`, `archive` and `about`.
+- Uses font awesome 5 for icons.
+- Beautiful page banner with image and video.
+- Beautiful Syntax Highlight using [highlight.js][highlight-js].
+- Beautiful image gallery previewer using [PhotoSwipe 5][photoswipe-5].
+- 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.
+- Complex and flexible table support using [Jekyll Spaceship][jekyll-spaceship] gem.
+- MathJAX and LaTeX optional support using [Jekyll Spaceship][jekyll-spaceship] gem.
+- Media (Youtube, Spotify, etc.) support using [Jekyll Spaceship][jekyll-spaceship] gem.
+- Diagram (PlantUML, Mermaid) support using [Jekyll Spaceship][jekyll-spaceship] gem.
+- Google Translation support.
+- New post tag support.
+- Pin post tag support.
Also, visit the [Live Demo][yat-live-demo] site for the theme.
@@ -104,9 +104,9 @@ Also, visit the [Live Demo][yat-live-demo] site for the theme.
There are three ways to install:
-- As a [gem-based theme](https://jekyllrb.com/docs/themes/#understanding-gem-based-themes).
-- As a [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) (GitHub Pages compatible).
-- Forking/directly copying all of the theme files into your project.
+- As a [gem-based theme](https://jekyllrb.com/docs/themes/#understanding-gem-based-themes).
+- As a [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) (GitHub Pages compatible).
+- Forking/directly copying all of the theme files into your project.
### Gem-based Theme Method
diff --git a/_config.yml b/_config.yml
index 341b385ca38..48ea920f2e5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,9 +43,9 @@ author: Gonzalo G. Fernandez
copyright: "Unpublished Work (cleft) 2023-{currentYear} {author}"
description: >- # this means to ignore newlines until "baseurl:"
- Write an awesome description for your new site here. You can edit this
- line in _config.yml. It will appear in your document head meta (for
- Google search results) and in your feed.xml site description.
+ Write an awesome description for your new site here. You can edit this
+ line in _config.yml. It will appear in your document head meta (for
+ Google search results) and in your feed.xml site description.
baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. https://example.com
@@ -54,7 +54,7 @@ favicon: "/assets/images/yat-favicon-color.png" # the favicon for your site
# Yat date format
# refer to https://shopify.github.io/liquid/filters/date/ if you want to customize this
yat:
- date_format: "%b %d, %Y"
+ date_format: "%b %d, %Y"
# If you want more debug log, you can set true
# debug: false
@@ -241,11 +241,11 @@ yat:
# highlighter: none
markdown: kramdown
kramdown:
- input: GFM
+ input: GFM
plugins:
- - jekyll-feed
- - jekyll-seo-tag
- - jekyll-sitemap
- - jekyll-paginate
- - jekyll-spaceship
+ - jekyll-feed
+ - jekyll-seo-tag
+ - jekyll-sitemap
+ - jekyll-paginate
+ - jekyll-spaceship
diff --git a/_data/defaults.yml b/_data/defaults.yml
index dcdca57c9df..ca7193e4c05 100644
--- a/_data/defaults.yml
+++ b/_data/defaults.yml
@@ -1,4 +1,4 @@
home:
- heading: "Yet Another TurtleBot"
- subheading: "Two-wheeled mobile robot based on SoC Zynq 7000"
- banner: "Your image url"
+ heading: "Yet Another TurtleBot"
+ subheading: "Two-wheeled mobile robot based on SoC Zynq 7000"
+ banner: "Your image url"
diff --git a/_includes/custom-head.html b/_includes/custom-head.html
index dfbd09addf9..c05d70d0a19 100644
--- a/_includes/custom-head.html
+++ b/_includes/custom-head.html
@@ -1,6 +1,5 @@
-{% comment %}
- Placeholder to allow defining custom head, in principle, you can add anything here, e.g. favicons:
-
- 1. Head over to https://realfavicongenerator.net/ to add your own favicons.
- 2. Customize default _includes/custom-head.html in your source directory and insert the given code snippet.
-{% endcomment %}
\ No newline at end of file
+{% comment %} Placeholder to allow defining custom head, in principle, you can
+add anything here, e.g. favicons: 1. Head over to
+https://realfavicongenerator.net/ to add your own favicons. 2. Customize default
+_includes/custom-head.html in your source directory and insert the given code
+snippet. {% endcomment %}
diff --git a/_includes/extensions/click-to-top.html b/_includes/extensions/click-to-top.html
index fadd32501a9..95c443d69c2 100644
--- a/_includes/extensions/click-to-top.html
+++ b/_includes/extensions/click-to-top.html
@@ -1,18 +1,18 @@
-
+
diff --git a/_includes/extensions/code-highlight.html b/_includes/extensions/code-highlight.html
index b7c6399f15c..0c8363e4788 100644
--- a/_includes/extensions/code-highlight.html
+++ b/_includes/extensions/code-highlight.html
@@ -1,91 +1,90 @@
-
+
-
+
-{%- 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 -%}
+{%- 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 -%}
diff --git a/_includes/extensions/comments/disqus.html b/_includes/extensions/comments/disqus.html
index b46f070519a..d166057eff4 100644
--- a/_includes/extensions/comments/disqus.html
+++ b/_includes/extensions/comments/disqus.html
@@ -1,17 +1,23 @@
-
-
- Please enable JavaScript to view the comments powered by Disqus.
+ s.setAttribute("data-timestamp", +new Date())
+ ;(d.head || d.body).appendChild(s)
+ })()
+
+Please enable JavaScript to view the
+ comments powered by Disqus.
diff --git a/_includes/extensions/comments/gitment.html b/_includes/extensions/comments/gitment.html
index b3a8beb92c2..3c06954190a 100644
--- a/_includes/extensions/comments/gitment.html
+++ b/_includes/extensions/comments/gitment.html
@@ -1,15 +1,21 @@
-
-
-
-
+
+ id: "{{ page.id }}",
+ owner: "{{ site.gitment.username }}",
+ repo: "{{ site.gitment.repo }}",
+ oauth: {
+ client_id: "{{ site.gitment.client_id }}",
+ client_secret: "{{ site.gitment.client_secret }}",
+ },
+ })
+ gitment.render("gitment_thread")
+
diff --git a/_includes/extensions/comments/utterances.html b/_includes/extensions/comments/utterances.html
index 8fe8bebfd4d..612acaf54f2 100644
--- a/_includes/extensions/comments/utterances.html
+++ b/_includes/extensions/comments/utterances.html
@@ -1,51 +1,62 @@
{%- if site.utterances.follow_site_theme -%}
{%- else -%}
-
+
{%- endif -%}
diff --git a/_includes/extensions/geopattern.html b/_includes/extensions/geopattern.html
index 3931533e8d1..02073698adb 100644
--- a/_includes/extensions/geopattern.html
+++ b/_includes/extensions/geopattern.html
@@ -1,21 +1,15 @@
-{% if include.selector %}
- {% assign selector = include.selector %}
-{% endif %}
-
-{% if include.seed %}
- {% assign seed = include.seed %}
-{% endif %}
+{% if include.selector %} {% assign selector = include.selector %} {% endif %}
+{% if include.seed %} {% assign seed = include.seed %} {% endif %}
-
diff --git a/_includes/extensions/google-analytics.html b/_includes/extensions/google-analytics.html
index 9ae896390e3..0f2277962d4 100644
--- a/_includes/extensions/google-analytics.html
+++ b/_includes/extensions/google-analytics.html
@@ -1,27 +1,31 @@
-
diff --git a/_includes/extensions/google-translate.html b/_includes/extensions/google-translate.html
index 830575a1eef..130fdc004f5 100644
--- a/_includes/extensions/google-translate.html
+++ b/_includes/extensions/google-translate.html
@@ -1,108 +1,114 @@
-{% if include.translate_langs %}
- {% assign translate_langs = include.translate_langs %}
-{% endif %}
+{% if include.translate_langs %} {% assign translate_langs =
+include.translate_langs %} {% endif %} {% if include.lang %} {% assign lang =
+include.lang %} {% endif %}
-{% if include.lang %}
- {% assign lang = include.lang %}
-{% endif %}
-
-
-
+
-
+
-
+
diff --git a/_includes/extensions/hashlocate.html b/_includes/extensions/hashlocate.html
index 0f3e29e6f8b..6f772d22b01 100644
--- a/_includes/extensions/hashlocate.html
+++ b/_includes/extensions/hashlocate.html
@@ -1,44 +1,44 @@
diff --git a/_includes/extensions/mathjax.html b/_includes/extensions/mathjax.html
index 7d271e35a4b..f757c23134f 100644
--- a/_includes/extensions/mathjax.html
+++ b/_includes/extensions/mathjax.html
@@ -1,10 +1,13 @@
+ src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"
+ type="text/javascript"
+ async
+>
diff --git a/_includes/extensions/photo-swipe.html b/_includes/extensions/photo-swipe.html
index fb3ee7a94b4..a4f8ac232ce 100644
--- a/_includes/extensions/photo-swipe.html
+++ b/_includes/extensions/photo-swipe.html
@@ -1,81 +1,85 @@
+ src="//cdnjs.cloudflare.com/ajax/libs/photoswipe/5.3.7/umd/photoswipe-lightbox.umd.min.js"
+ async
+>
+ src="//cdnjs.cloudflare.com/ajax/libs/photoswipe/5.3.7/umd/photoswipe.umd.min.js"
+ async
+>
diff --git a/_includes/extensions/theme-toggle.html b/_includes/extensions/theme-toggle.html
index 634c932d9f5..fc808c515c5 100644
--- a/_includes/extensions/theme-toggle.html
+++ b/_includes/extensions/theme-toggle.html
@@ -1,108 +1,106 @@
-{%- assign name = 'night_mode' -%}
-{%- include functions.html func='get_value' default='auto' -%}
-{%- assign night_mode = return -%}
+{%- assign name = 'night_mode' -%} {%- include functions.html func='get_value'
+default='auto' -%} {%- assign night_mode = return -%}
diff --git a/_includes/extensions/trianglify.html b/_includes/extensions/trianglify.html
index 99ca3713047..f1fb8123a43 100644
--- a/_includes/extensions/trianglify.html
+++ b/_includes/extensions/trianglify.html
@@ -1,26 +1,24 @@
-{% if include.selector %}
- {% assign selector = include.selector %}
-{% endif %}
+{% if include.selector %} {% assign selector = include.selector %} {% endif %}
+{% if include.seed %} {% assign seed = include.seed %} {% endif %}
-{% if include.seed %}
- {% assign seed = include.seed %}
-{% endif %}
-
-
+
diff --git a/_includes/functions.html b/_includes/functions.html
index 5c00bb57752..d0501f07f8a 100644
--- a/_includes/functions.html
+++ b/_includes/functions.html
@@ -1,30 +1,11 @@
-{%- assign params = include -%}
-{%- if params.func -%}
- {%- assign func = params.func -%}
-{%- endif -%}
-
-{%- assign include_path = func -%}
-{%- assign path_array = include_path | split: '.' -%}
-{%- if path_array.size == 1 -%}
- {%- assign include_path = include_path | append: '.html' -%}
-{%- endif -%}
-
-{%- if func == 'log' -%}
- {%- include functions/log.html level=include.level msg=include.msg -%}
-{%- else -%}
- {%- assign include_path = 'functions/' | append: include_path -%}
- {%- include {{ include_path }} params=params-%}
-{%- endif -%}
-
-{%- if return == nil -%}
- {%- assign return = include.default -%}
-{%- endif -%}
-
-{%- if func != 'log' -%}
- {%- assign msg = '[function]['
- | append: {{func}}
- | append: '] '
- | append: {{return}}
- -%}
- {%- include functions.html func='log' level='info' -%}
-{%- endif -%}
+{%- assign params = include -%} {%- if params.func -%} {%- assign func =
+params.func -%} {%- endif -%} {%- assign include_path = func -%} {%- assign
+path_array = include_path | split: '.' -%} {%- if path_array.size == 1 -%} {%-
+assign include_path = include_path | append: '.html' -%} {%- endif -%} {%- if
+func == 'log' -%} {%- include functions/log.html level=include.level
+msg=include.msg -%} {%- else -%} {%- assign include_path = 'functions/' |
+append: include_path -%} {%- include {{ include_path }} params=params-%} {%-
+endif -%} {%- if return == nil -%} {%- assign return = include.default -%} {%-
+endif -%} {%- if func != 'log' -%} {%- assign msg = '[function][' | append:
+{{func}} | append: '] ' | append: {{return}} -%} {%- include functions.html
+func='log' level='info' -%} {%- endif -%}
diff --git a/_includes/functions/get_article_excerpt.html b/_includes/functions/get_article_excerpt.html
index b34a13fb1c2..e7b4c5f6bd1 100644
--- a/_includes/functions/get_article_excerpt.html
+++ b/_includes/functions/get_article_excerpt.html
@@ -1,39 +1,12 @@
-{% 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.text_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 %}
+{% 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.text_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 %}
diff --git a/_includes/functions/get_article_words.html b/_includes/functions/get_article_words.html
index 69db9c6c39f..4df0d20d4ed 100644
--- a/_includes/functions/get_article_words.html
+++ b/_includes/functions/get_article_words.html
@@ -1,26 +1,7 @@
-{% 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 %}
+{% 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 %}
diff --git a/_includes/functions/get_banner.html b/_includes/functions/get_banner.html
index 502d7fc2481..ed2cdafcbff 100644
--- a/_includes/functions/get_banner.html
+++ b/_includes/functions/get_banner.html
@@ -1,68 +1,37 @@
{%- 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 %}
-
+{% 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
+%}
diff --git a/_includes/functions/get_categories.html b/_includes/functions/get_categories.html
index babb7a0ff8f..6e801e8e308 100644
--- a/_includes/functions/get_categories.html
+++ b/_includes/functions/get_categories.html
@@ -1,12 +1,4 @@
-{% assign split_mark = '<|>' %}
-
-{% assign categories = '' %}
-{% for category in site.categories %}
- {% assign name = category | first %}
- {% assign categories = categories | append: split_mark | append: name %}
-{% endfor %}
-
-{% assign return = categories
- | remove_first: split_mark
- | split: split_mark
- | sort: self %}
+{% assign split_mark = '<|>' %} {% assign categories = '' %} {% for category in
+site.categories %} {% assign name = category | first %} {% assign categories =
+categories | append: split_mark | append: name %} {% endfor %} {% assign return
+= categories | remove_first: split_mark | split: split_mark | sort: self %}
diff --git a/_includes/functions/get_datetimes.html b/_includes/functions/get_datetimes.html
index f5b4d7efaa4..e3a57acb9a0 100644
--- a/_includes/functions/get_datetimes.html
+++ b/_includes/functions/get_datetimes.html
@@ -1,18 +1,5 @@
-{% if include.params.filter %}
- {% assign filter = include.params.filter %}
-{% endif %}
-
-{% assign split_mark = '<|>' %}
-
-{% assign dates = '' %}
-{% for post in site.posts %}
- {% assign name = post.date | date: filter %}
- {% assign dates = dates | append: split_mark | append: name %}
-{% endfor %}
-
-{% assign return = dates
- | remove_first: split_mark
- | split: split_mark
- | sort: self
- | uniq %}
-
+{% if include.params.filter %} {% assign filter = include.params.filter %} {%
+endif %} {% assign split_mark = '<|>' %} {% assign dates = '' %} {% for post in
+site.posts %} {% assign name = post.date | date: filter %} {% assign dates =
+dates | append: split_mark | append: name %} {% endfor %} {% assign return =
+dates | remove_first: split_mark | split: split_mark | sort: self | uniq %}
diff --git a/_includes/functions/get_reading_time.html b/_includes/functions/get_reading_time.html
index 003578410f7..4c88fcfd3d3 100644
--- a/_includes/functions/get_reading_time.html
+++ b/_includes/functions/get_reading_time.html
@@ -1,49 +1,14 @@
-{% 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.speed %}
- {% assign speed = include.params.speed %}
-{% else %}
- {% assign speed = 160 %}
-{% endif %}
-
-{%- include functions.html func='get_article_words' -%}
-{% assign words = return %}
-
-{% assign total_mins = words
- | divided_by: speed
- | at_least: 1 %}
-
-{% assign hours = total_mins | divided_by: 60 %}
-{% assign mins = total_mins | modulo: 60 %}
-
-{% assign return = "About" %}
-
-{% if hours > 0 %}
- {% assign unit = "hour" %}
- {% if hours > 1 %}
- {% assign unit = unit | append: "s" %}
- {% endif %}
- {% assign return = return
- | append: " "
- | append: hours
- | append: " "
- | append: unit %}
-{% endif %}
-
-{% assign unit = "min" %}
-{% if mins > 1 %}
- {% assign unit = unit | append: "s" %}
-{% endif %}
-{% assign return = return
- | append: " "
- | append: mins
- | append: " "
- | append: unit %}
+{% 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.speed %} {% assign speed = include.params.speed %} {%
+else %} {% assign speed = 160 %} {% endif %} {%- include functions.html
+func='get_article_words' -%} {% assign words = return %} {% assign total_mins =
+words | divided_by: speed | at_least: 1 %} {% assign hours = total_mins |
+divided_by: 60 %} {% assign mins = total_mins | modulo: 60 %} {% assign return =
+"About" %} {% if hours > 0 %} {% assign unit = "hour" %} {% if hours > 1 %} {%
+assign unit = unit | append: "s" %} {% endif %} {% assign return = return |
+append: " " | append: hours | append: " " | append: unit %} {% endif %} {%
+assign unit = "min" %} {% if mins > 1 %} {% assign unit = unit | append: "s" %}
+{% endif %} {% assign return = return | append: " " | append: mins | append: " "
+| append: unit %}
diff --git a/_includes/functions/get_tags.html b/_includes/functions/get_tags.html
index 8528eeb2edf..d97e9012b0e 100644
--- a/_includes/functions/get_tags.html
+++ b/_includes/functions/get_tags.html
@@ -1,12 +1,4 @@
-{% assign split_mark = '<|>' %}
-
-{% assign tags = '' %}
-{% for tag in site.tags %}
- {% assign name = tag | first %}
- {% assign tags = tags | append: split_mark | append: name %}
-{% endfor %}
-
-{% assign return = tags
- | remove_first: split_mark
- | split: split_mark
- | sort: self %}
+{% assign split_mark = '<|>' %} {% assign tags = '' %} {% for tag in site.tags
+%} {% assign name = tag | first %} {% assign tags = tags | append: split_mark |
+append: name %} {% endfor %} {% assign return = tags | remove_first: split_mark
+| split: split_mark | sort: self %}
diff --git a/_includes/functions/get_value.html b/_includes/functions/get_value.html
index 6d9ac81bdf6..4f032fb06b3 100644
--- a/_includes/functions/get_value.html
+++ b/_includes/functions/get_value.html
@@ -1,42 +1,12 @@
-{%- if include.params.name -%}
- {%- assign name = include.params.name -%}
-{%- 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 -%}
-
+{%- if include.params.name -%} {%- assign name = include.params.name -%} {%-
+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 -%}
diff --git a/_includes/functions/log.html b/_includes/functions/log.html
index 95d18564784..de8a59486f9 100644
--- a/_includes/functions/log.html
+++ b/_includes/functions/log.html
@@ -1,17 +1,8 @@
-{% if include.params.level %}
- {% assign level = include.params.level %}
-{% endif %}
-
-{% if include.params.msg %}
- {% assign msg = include.params.msg %}
-{% endif %}
-
-{% if site.debug == true %}
- {% if level == 'debug' %}
- {% if jekyll.environment == "development" %}
-
- {% endif %}
- {% else %}
-
- {% endif %}
-{% endif %}
+{% if include.params.level %} {% assign level = include.params.level %} {% endif
+%} {% if include.params.msg %} {% assign msg = include.params.msg %} {% endif %}
+{% if site.debug == true %} {% if level == 'debug' %} {% if jekyll.environment
+== "development" %}
+
+{% endif %} {% else %}
+
+{% endif %} {% endif %}
diff --git a/_includes/head.html b/_includes/head.html
index 816a80374f7..251bc84d339 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,20 +1,26 @@
-
-
-
-
- {%- seo -%}
-
-
-
-
-
-
- {%- feed_meta -%}
- {%- if jekyll.environment == 'production' and site.google_analytics -%}
- {%- include extensions/google-analytics.html -%}
- {%- endif -%}
- {%- include extensions/code-highlight.html -%}
- {%- include extensions/photo-swipe.html -%}
- {%- include custom-head.html -%}
+
+
+
+
+ {%- seo -%}
+
+
+
+
+
+
+ {%- feed_meta -%} {%- if jekyll.environment == 'production' and
+ site.google_analytics -%} {%- include extensions/google-analytics.html -%}
+ {%- endif -%} {%- include extensions/code-highlight.html -%} {%- include
+ extensions/photo-swipe.html -%} {%- include custom-head.html -%}
diff --git a/_includes/sidebar/archive-list.html b/_includes/sidebar/archive-list.html
index b8103fa2196..475c75a758f 100644
--- a/_includes/sidebar/archive-list.html
+++ b/_includes/sidebar/archive-list.html
@@ -1,10 +1,5 @@
-{%- include functions.html func='log' level='debug' msg='Get datetimes value' -%}
-
-{% assign filter = '%Y' %}
-{% include functions.html func='get_datetimes' %}
-{% assign datetimes = return %}
-
-{% assign keys = datetimes %}
-{% assign field = 'date' %}
-{% assign url = '/archives.html' | relative_url %}
-{% include sidebar/common-list.html %}
+{%- include functions.html func='log' level='debug' msg='Get datetimes value'
+-%} {% assign filter = '%Y' %} {% include functions.html func='get_datetimes' %}
+{% assign datetimes = return %} {% assign keys = datetimes %} {% assign field =
+'date' %} {% assign url = '/archives.html' | relative_url %} {% include
+sidebar/common-list.html %}
diff --git a/_includes/sidebar/article-menu.html b/_includes/sidebar/article-menu.html
index 3e618ff73d8..813cb226d53 100644
--- a/_includes/sidebar/article-menu.html
+++ b/_includes/sidebar/article-menu.html
@@ -1,122 +1,134 @@
diff --git a/_includes/sidebar/category-list.html b/_includes/sidebar/category-list.html
index 6922fbd7860..bc028e7ef8e 100644
--- a/_includes/sidebar/category-list.html
+++ b/_includes/sidebar/category-list.html
@@ -1,9 +1,5 @@
-{%- include functions.html func='log' level='debug' msg='Get categories value' -%}
-
-{%- include functions.html func='get_categories' -%}
-{% assign categories = return %}
-
-{% assign keys = categories %}
-{% assign field = 'categories' %}
-{% assign url = '/categories.html' | relative_url %}
-{% include sidebar/common-list.html %}
+{%- include functions.html func='log' level='debug' msg='Get categories value'
+-%} {%- include functions.html func='get_categories' -%} {% assign categories =
+return %} {% assign keys = categories %} {% assign field = 'categories' %} {%
+assign url = '/categories.html' | relative_url %} {% include
+sidebar/common-list.html %}
diff --git a/_includes/sidebar/common-list.html b/_includes/sidebar/common-list.html
index b8f643f6b6a..641f3a4623d 100644
--- a/_includes/sidebar/common-list.html
+++ b/_includes/sidebar/common-list.html
@@ -1,25 +1,21 @@
-{%- if include.keys -%}
- {%- assign keys = include.keys -%}
-{%- endif -%}
-
-{%- if include.field -%}
- {%- assign field = include.field -%}
-{%- endif -%}
+{%- if include.keys -%} {%- assign keys = include.keys -%} {%- endif -%} {%- if
+include.field -%} {%- assign field = include.field -%} {%- endif -%}
diff --git a/_includes/sidebar/google-translate.html b/_includes/sidebar/google-translate.html
index 496e6e01560..92a90776cee 100644
--- a/_includes/sidebar/google-translate.html
+++ b/_includes/sidebar/google-translate.html
@@ -1,3 +1 @@
-
-{%- include extensions/google-translate.html -%}
-
+{%- include extensions/google-translate.html -%}
diff --git a/_includes/sidebar/tag-list.html b/_includes/sidebar/tag-list.html
index e6c22042dab..dbb216d8c68 100644
--- a/_includes/sidebar/tag-list.html
+++ b/_includes/sidebar/tag-list.html
@@ -1,9 +1,4 @@
-{%- include functions.html func='log' level='debug' msg='Get tags value' -%}
-
-{%- include functions.html func='get_tags' -%}
-{% assign tags = return %}
-
-{% assign keys = tags %}
-{% assign field = 'tags' %}
-{% assign url = '/tags.html' | relative_url %}
-{%- include sidebar/common-list.html -%}
+{%- include functions.html func='log' level='debug' msg='Get tags value' -%} {%-
+include functions.html func='get_tags' -%} {% assign tags = return %} {% assign
+keys = tags %} {% assign field = 'tags' %} {% assign url = '/tags.html' |
+relative_url %} {%- include sidebar/common-list.html -%}
diff --git a/_includes/views/article.html b/_includes/views/article.html
index 534a95b8e34..24b35c06b93 100644
--- a/_includes/views/article.html
+++ b/_includes/views/article.html
@@ -1,9 +1,9 @@
-
-
+
-
- {{ content }}
-
+ {{ content }}
-
diff --git a/_includes/views/banner.html b/_includes/views/banner.html
index 1db45a59355..fca1a15c45f 100644
--- a/_includes/views/banner.html
+++ b/_includes/views/banner.html
@@ -1,30 +1,20 @@
-{%- include functions.html func='log' level='debug' msg='Get banner_html value' -%}
-{% assign name = 'banner_html' %}
-{%- include functions.html func='get_value' -%}
-{% assign banner_html = return %}
-
-{%- include functions.html func='log' level='debug' msg='Get heading value' -%}
-{% assign name = 'heading' %}
-{%- include functions.html func='get_value' -%}
-{% assign heading = return %}
-
-{%- include functions.html func='log' level='debug' msg='Get subheading value' -%}
-{% assign name = 'subheading' %}
-{%- include functions.html func='get_value' -%}
-{% assign subheading = return %}
-
-{%- include functions.html func='get_banner' -%}
-
-{%- if has_banner -%}
- {%- if banner_background -%}
-
- {%- endif -%}
- {%- if banner_height -%}
-
+{%- endif -%} {%- if banner_height -%}
+
- {%- endif -%}
-
- {%- if banner_opacity -%}
-
+{%- endif -%} {%- if banner_opacity -%}
+
- {%- endif -%}
- {%- if banner_heading_style -%}
-
+{%- endif -%} {%- if banner_heading_style -%}
+
- {%- endif -%}
- {%- if banner_subheading_style -%}
-
+{%- endif -%} {%- if banner_subheading_style -%}
+
- {%- endif -%}
-
+
+{%- endif -%}
+
- {%- if banner_video -%}
-
-
+ {%- if banner_video -%}
+
+
- {%- else -%}
+ {%- else -%}
-
- {%- endif -%}
+
+ {%- endif -%}
-
-
- {%- if banner_html -%}
-
- {%- assign banner_html = 'views/' | append: banner_html -%}
- {%- include {{ banner_html }} -%}
-
- {%- else -%}
+
+ {%- if banner_html -%} {%- assign banner_html = 'views/' | append:
+ banner_html -%} {%- include {{ banner_html }} -%} {%- else -%}
-
-
- {{ heading | default: page.title | escape }}
-
-
- {{ subheading | default: page.subtitle | escape }}
-
-
+
+
+ {{ heading | default: page.title | escape }}
+
+
+ {{ subheading | default: page.subtitle | escape }}
+
+
- {%- endif -%}
-
+ {%- endif -%}
+
-
+
{%- endif -%}
-
diff --git a/_includes/views/footer.html b/_includes/views/footer.html
index 0d9dc2c7965..b5f0aaac5fe 100644
--- a/_includes/views/footer.html
+++ b/_includes/views/footer.html
@@ -1,21 +1,32 @@