jekyll-text-theme 2.1.0 → 2.2.0

data/_includes/article-list.html

@@ -1,6 +1,9 @@
 {%- assign _excerpt_truncate = include.excerpt_truncate | default: 350 -%}
 
-{%- assign _excerpt_type = include.excerpt_type | default: site.data.variables.default.excerpt_type  -%}
+{%- assign _excerpt_type = include.excerpt_type -%}
+
+{%- include snippets/locale-to-string.html locale=site.data.locale.READMORE -%}
+{%- assign _locale_readmore = __return -%}
 
 {%- assign _sorted_list = include.articles -%}
 {%- if include.group_by == 'year' -%}
@@ -10,37 +13,65 @@
   {%- assign _sorted_list = _sorted_list | reverse -%}
 {%- endif -%}
 
-{%- if include.type == 'common' -%}
-<div class="items items--divided">
+{%- if include.type == 'item' -%}
+<div class="article-list items items--divided">
 {%- elsif include.type == 'brief' -%}
-<div class="items">
+<div class="article-list items">
+{%- elsif include.type == 'grid' -%}
+<div class="article-list grid grid--p-3">
 {%- endif -%}
 
   {%- for _article in _sorted_list -%}
 
     {%- include snippets/prepend-baseurl.html path=_article.url -%}
-    {%- assign _href = __return -%}
+    {%- assign _article_url = __return -%}
 
-    {%- include snippets/locale-to-string.html locale=site.data.locale.READMORE -%}
-    {%- assign _locale_readmore = __return -%}
+    {%- if _article.cover -%}
+      {%- include snippets/get-nav-url.html path=_article.cover -%}
+      {%- assign _article_cover = __return -%}
+    {%- endif -%}
 
-    {%- if include.type == 'common' -%}
-      <article class="item" itemscope itemtype="http://schema.org/BlogPosting">
+    {%- if include.type == 'item' -%}
+      {%- if include.article_type == 'BlogPosting' -%}
+        <article class="item" itemscope itemtype="http://schema.org/BlogPosting">
+      {%- else -%}
+        <article class="item">
+      {%- endif -%}
+        {%- if _article.cover and include.show_cover-%}
+          {%- include snippets/get-nav-url.html path=_article.cover -%}
+          {%- assign _article_cover = __return -%}
+          <div class="item__image">
+          {%- if include.cover_size == 'lg' -%}
+            <img class="image image--lg" src="{{ _article_cover }}" />
+          {%- elsif include.cover_size == 'sm' -%}
+            <img class="image image--sm" src="{{ _article_cover }}" />
+          {%- else -%}
+            <img class="image" src="{{ _article_cover }}" />
+          {%- endif -%}
+          </div>
+        {%- endif -%}
         <div class="item__content">
-          <header><h2 itemprop="headline" class="item__header"><a href="{{ _href }}">{{ _article.title }}</a></h2></header>
+          <header><h2 itemprop="headline" class="item__header"><a href="{{ _article_url }}">{{ _article.title }}</a></h2></header>
           <div class="item__description">
             {%- if _article.excerpt and include.show_excerpt -%}
               <div class="article__content" itemprop="description articleBody">
                 {%- if _excerpt_type == 'html' -%}
                   {{ _article.excerpt }}
                 {%- else -%}
-                  {{ _article.excerpt | strip_html | truncate: _excerpt_truncate }}
+                  {{ _article.excerpt | strip_html | strip | truncate: _excerpt_truncate }}
                 {%- endif -%}
               </div>
             {%- endif -%}
-            <p><a href="{{ _href }}">{{ _locale_readmore }}</a></p>
+            {%- if include.show_readmore -%}
+              <p><a href="{{ _article_url }}">{{ _locale_readmore }}</a></p>
+            {%- endif -%}
           </div>
-          {%- include article-info.html article=_article show_pageview=true -%}
+          {%- if include.show_info -%}
+            {%- include snippets/assign.html target=site.data.variables.default.page.pageview
+              source0=_article.pageview -%}
+            {%- assign _show_pageview = __return -%}
+            {%- include article-info.html article=_article show_pageview=_show_pageview -%}
+          {%- endif -%}
         </div>
       </article>
 
@@ -65,9 +96,45 @@
       {%- endif -%}
       {%- include snippets/locale-to-string.html locale=site.data.locale.ARTICLE_LIST_DATE_FORMAT -%}
       <li class="item" itemscope itemtype="http://schema.org/BlogPosting" data-tags="{{ _tags }}">
-        <div class="item__content"><span class="item__meta">{{ _article.date | date: __return }}</span><a itemprop="headline" class="item__header" href="{{ _href }}">{{ _article.title }}</a></div>
+        <div class="item__content">
+          {%- if include.show_info -%}
+            <span class="item__meta">{{ _article.date | date: __return }}</span>
+          {%- endif -%}
+          <a itemprop="headline" class="item__header" href="{{ _article_url }}">{{ _article.title }}</a></div>
       </li>
-    {%- endif -%}
 
+    {%- elsif include.type == 'grid' -%}
+      {%- if include.size == 'sm' -%}
+        <div class="cell cell--3 cell--md-4 cell--sm-12">
+          <div class="card">
+            {%- if _article_cover -%}
+              <div class="card__image">
+                <img class="image" src="{{ _article_cover }}" />
+                <div class="overlay overlay--bottom">
+                  <header>
+                    <a class="card__header" href="{{ _article_url }}">{{ _article.title }}</a>
+                  </header>
+                </div>
+              </div>
+            {%- endif -%}
+            </div>
+        </div>
+      {%- else -%}
+
+        <div class="cell cell--4 cell--md-6 cell--sm-12">
+          <div class="card card--flat">
+            {%- if _article_cover -%}
+              <div class="card__image"><img src="{{ _article_cover }}" /></div>
+            {%- endif -%}
+              <div class="card__content">
+                <header>
+                  <h2 class="card__header"><a href="{{ _article_url }}">{{ _article.title }}</a></h2>
+                </header>
+              </div>
+          </div>
+        </div>
+      {%- endif -%}
+    {%- endif -%}
   {%- endfor -%}
+
 </div>

data/_includes/article-section-navigator.html

@@ -30,8 +30,8 @@
   {%- endif -%}
 
 {%- else -%}
-  {%- assign _previous = page.next -%}
-  {%- assign _next = page.previous -%}
+  {%- assign _previous = page.previous -%}
+  {%- assign _next = page.next -%}
 {%- endif -%}
 
 {%- if _next or _previous -%}

data/_includes/author-links.html

@@ -1,8 +1,7 @@
 {%- assign _author = include.author -%}
 
 <div class="author-links">
-  <ul class="menu menu--nowrap menu--center">
-
+  <ul class="menu menu--nowrap menu--inline">
 
     {%- if _author.url -%}
       <link itemprop="url" href="{{ _author.url }}">

data/_includes/footer.html

@@ -18,7 +18,9 @@
       {%- if _site_author.bio -%}
         <meta itemprop="description" content="{{ _site_author.bio }}">
       {%- endif -%}
-      {%- include author-links.html author=_site_author -%}
+      <div class="footer__author-links">
+        {%- include author-links.html author=_site_author -%}
+      </div>
     </aside>
     <footer class="site-info">
       {%- assign _paths_rss = site.paths.rss | default: site.data.variables.default.paths.rss -%}

data/_includes/head.html

@@ -2,10 +2,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 
-{%- include snippets/page-title.html -%}
+{%- include snippets/get-article-title.html article=page -%}
 <title>{%- if __return -%}{{ __return }} - {{ site.title }}{%- else -%}{{ site.title }}{%- endif -%}</title>
 
-<meta name="description" content="{%- if page.excerpt -%}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{%- else -%}{{ site.description }}{%- endif -%}">
+<meta name="description" content="{%- if page.excerpt -%}{{ page.excerpt | strip_html | strip_newlines | strip | truncate: 160 }}{%- else -%}{{ site.description }}{%- endif -%}">
 <link rel="canonical" href="{%- include snippets/page-url.html -%}">
 
 {%- assign _paths_rss = site.paths.rss | default: site.data.variables.default.paths.rss -%}

data/_includes/header.html

@@ -1,34 +1,40 @@
-<header class="header">
-  <div class="main">
-    <div class="header__main">
-      <div class="logo">
-        {%- include svg/logo.svg -%}
-        {%- assign _paths_root = site.paths.root | default: site.data.variables.default.paths.root  -%}
-        {%- include snippets/get-nav-url.html path=_paths_root -%}
-        {%- if site.title -%}
-          <a title="{%- if site.description -%}{{ site.description }}{%- endif -%}" href="{{ __return }}">{{ site.title }}</a>
-        {%- endif -%}
+{%- if include.theme == 'dark' -%}
+  <header class="header header--dark">
+{%- elsif include.theme == 'light' -%}
+  <header class="header header--light">
+{%- else -%}
+  <header class="header">
+{%- endif -%}
+    <div class="main">
+      <div class="header__title">
+        <div class="header__brand">
+          {%- include svg/logo.svg -%}
+          {%- assign _paths_root = site.paths.root | default: site.data.variables.default.paths.root  -%}
+          {%- include snippets/get-nav-url.html path=_paths_root -%}
+          {%- if site.title -%}
+            <a title="{%- if site.description -%}{{ site.description }}{%- endif -%}" href="{{ __return }}">{{ site.title }}</a>
+          {%- endif -%}
+        </div>
+        <button class="button button--secondary button--circle search-button js-search-toggle"><i class="fas fa-search"></i></button>
       </div>
-      <button class="button button--secondary button--circle search-button js-search-toggle"><i class="fas fa-search"></i></button>
+      {%- if site.data.navigation.header -%}
+      <nav class="navigation">
+        <ul>
+          {%- for _item in site.data.navigation.header -%}
+            {%- include snippets/get-nav-url.html path=_item.url -%}
+            {%- assign _nav_url = __return -%}
+            {%- include snippets/get-nav-url.html path=page.url -%}
+            {%- assign _page_url = __return -%}
+            {%- include snippets/locale-to-string.html locale=_item.titles -%}
+            {%- if _nav_url == _page_url -%}
+              <li class="navigation__link navigation__link--active"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
+            {%- else -%}
+              <li class="navigation__link"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
+            {%- endif -%}
+          {%- endfor -%}
+          <li><button class="button button--secondary button--circle search-button js-search-toggle"><i class="fas fa-search"></i></button></li>
+        </ul>
+      </nav>
+      {%- endif -%}
     </div>
-    {%- if site.data.navigation.header -%}
-    <nav class="navigation">
-      <ul>
-        {%- for _item in site.data.navigation.header -%}
-          {%- include snippets/get-nav-url.html path=_item.url -%}
-          {%- assign _nav_url = __return -%}
-          {%- include snippets/get-nav-url.html path=page.url -%}
-          {%- assign _page_url = __return -%}
-          {%- include snippets/locale-to-string.html locale=_item.titles -%}
-          {%- if _nav_url == _page_url -%}
-            <li class="active"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
-          {%- else -%}
-            <li><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
-          {%- endif -%}
-        {%- endfor -%}
-        <li><button class="button button--secondary button--circle search-button js-search-toggle"><i class="fas fa-search"></i></button></li>
-      </ul>
-    </nav>
-    {%- endif -%}
-  </div>
-</header>
+  </header>

data/_includes/markdown-enhancements.html

@@ -1,20 +1,17 @@
-{%- include snippets/assign.html target=site.data.variables.default.chart source0=site.chart -%}
-{%- include snippets/assign.html target=__return source0=page.chart -%}
-
+{%- include snippets/assign.html target=site.data.variables.default.chart
+  source0=site.chart source1=page.chart -%}
 {%- if __return == true -%}
   {%- include markdown-enhancements/chart.html -%}
 {%- endif -%}
 
-{%- include snippets/assign.html target=site.data.variables.default.mathjax source0=site.mathjax -%}
-{%- include snippets/assign.html target=__return source0=page.mathjax -%}
-
+{%- include snippets/assign.html target=site.data.variables.default.mathjax
+  source0=site.mathjax source1=page.mathjax -%}
 {%- if __return == true -%}
   {%- include markdown-enhancements/mathjax.html -%}
 {%- endif -%}
 
-{%- include snippets/assign.html target=site.data.variables.default.mermaid source0=site.mermaid -%}
-{%- include snippets/assign.html target=__return source0=page.mermaid -%}
-
+{%- include snippets/assign.html target=site.data.variables.default.mermaid
+  source0=site.mermaid source1=page.mermaid -%}
 {%- if __return == true -%}
   {%- include markdown-enhancements/mermaid.html -%}
 {%- endif -%}

data/_includes/markdown-enhancements/mathjax.html

@@ -1,8 +1,8 @@
 {%- include snippets/get-sources.html -%}
 {%- assign _sources = __return -%}
 
-{%- include snippets/assign.html target=site.data.variables.default.mathjax_autoNumber source0=site.mathjax_autoNumber -%}
-{%- include snippets/assign.html target=__return source0=page.mathjax_autoNumber -%}
+{%- include snippets/assign.html target=site.data.variables.default.mathjax_autoNumber
+  source0=site.mathjax_autoNumber source1=page.mathjax_autoNumber -%}
 {%- assign _mathjax_autoNumber = __return -%}
 
 <script type="text/x-mathjax-config">

data/_includes/scripts/article.js

@@ -12,7 +12,7 @@
         $this = $(this);
         $this.attr('data-lang', $this.find('code').attr('data-lang'));
       });
-      $articleContent.find('h1, h2, h3, h4, h5, h6').each(function() {
+      $articleContent.find('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id]').each(function() {
         $this = $(this);
         $this.append($('<a class="anchor" aria-hidden="true"></a>').html('<i class="fas fa-anchor"></i>'));
       });

data/_includes/scripts/lib/affix.js

@@ -86,9 +86,9 @@
         $scrollTarget.on('scroll', function() {
           disabled || setState();
         });
-        $window.on('resize', window.throttle(function() {
+        $window.on('resize', function() {
           disabled || (calc(true), setState());
-        }, 100));
+        });
         hasInit = true;
       }
     }

data/_includes/scripts/lib/toc.js

@@ -11,7 +11,7 @@
       _options.scrollTarget && (scrollTarget = _options.scrollTarget);
       _options.scroller && (scroller = _options.scroller);
       _options.disabled !== undefined && (disabled = _options.disabled);
-      $headings = $(container).find(selectors);
+      $headings = $(container).find(selectors).filter('[id]');
       $scrollTarget = $(scrollTarget);
       $scroller = $(scroller);
     }

data/_includes/scripts/variables.html

@@ -7,6 +7,7 @@
 <script>
   (function() {
     var TEXT_VARIABLES = {
+      version: '2.2.0',
       sources: {
         font_awesome: '{{ _sources.font_awesome }}',
         jquery: '{{ _sources.jquery }}',

data/_includes/snippets/{page-title.html → get-article-title.html}

@@ -1,5 +1,5 @@
-{%- assign _title = page.title | default: layout.title -%}
-{%- assign _titles = page.titles | default: layout.titles -%}
+{%- assign _title = include.article.title | default: layout.title -%}
+{%- assign _titles = include.article.titles | default: layout.titles -%}
 
 {%- if _title -%}
   {%- assign __return = _title -%}

data/_layouts/archive.html

@@ -10,7 +10,7 @@ titles:
 <div class="layout--archive js-all">
   {%- include tags.html -%}
   <div class="js-result layout--archive__result d-none">
-    {%- include article-list.html articles=site.posts type='brief' reverse=true group_by='year' -%}
+    {%- include article-list.html articles=site.posts type='brief' show_info=true reverse=true group_by='year' -%}
   </div>
 </div>
 

data/_layouts/article.html

@@ -3,10 +3,14 @@ layout: page
 type: article
 ---
 
-{%- include snippets/assign.html target=site.data.variables.default.page.show_author_profile source0=layout.show_author_profile -%}
-{%- include snippets/assign.html target=__return source0=page.show_author_profile -%}
+{%- include snippets/assign.html target=site.data.variables.default.page.show_author_profile
+  source0=layout.show_author_profile source1=page.show_author_profile -%}
 {%- assign _show_author_profile = __return -%}
 
+{%- include snippets/assign.html target=site.data.variables.default.page.license
+  source0=layout.license source1=page.license -%}
+{%- assign _license = __return -%}
+
 <div class="layout--article">
 
   <div class="article__content" itemprop="articleBody">{{ content }}</div>
@@ -35,8 +39,17 @@ type: article
       {%- include article-footer/author-profile.html author=_author -%}
     {%- endif -%}
 
-    {%- if page.license -%}
-      <div class="article__license">{%- include article-footer/license.html -%}</div>
+    {%- if _license != false -%}
+      {%- assign _data_license = site.data.licenses-%}
+      {%- if site.license -%}
+        {%- assign _license_data = _data_license[site.license] -%}
+      {%- endif -%}
+      {%- if _license != true -%}
+        {%- assign _license_data = _data_license[_license] -%}
+      {%- endif -%}
+      <div class="article__license">
+        {%- include article-footer/license.html license=_license_data -%}
+      </div>
     {%- endif -%}
   </footer>
 

data/_layouts/articles.html

@@ -0,0 +1,89 @@
+---
+layout: page
+---
+
+{%- assign _page_articles_data_source = page.articles.data_source | default: layout.articles.data_source -%}
+
+{%- if _page_articles_data_source -%}
+{%- assign _keys = _page_articles_data_source | split: '.' -%}
+{%- endif -%}
+
+{%- assign _articles = nil -%}
+{%- for _key in _keys -%}
+  {%- if forloop.first -%}
+    {%- case _key -%}
+      {%- when 'site' -%}
+        {%- assign _articles = site -%}
+      {%- when 'page' -%}
+        {%- assign _articles = page -%}
+      {%- when 'layout' -%}
+        {%- assign _articles = layout -%}
+      {%- when 'paginator' -%}
+        {%- assign _articles = paginator -%}
+      {%- else -%}
+        {%- assign _articles = site[_key] -%}
+      {%- else -%}
+    {%- endcase -%}
+  {%- else -%}
+    {%- assign _articles = _articles[_key] -%}
+  {%- endif -%}
+{%- endfor -%}
+
+{%- assign _type = page.articles.type | default: layout.articles.type -%}
+
+{%- if _articles -%}
+
+  <div class="layout--articles">
+
+    {%- if _type == 'grid' -%}
+      {%- if page.articles.size == 'sm' -%}
+        {%- include article-list.html articles=_articles type='grid' size='sm' -%}
+      {%- else -%}
+        {%- include article-list.html articles=_articles type='grid' -%}
+      {%- endif -%}
+
+    {%- elsif _type == 'brief' -%}
+      {%- include snippets/assign.html
+        target=site.data.variables.default.page.articles.show_info
+        source0=layout.articles.show_info source1=page.articles.show_info -%}
+      {%- assign _show_info = __return -%}
+
+      {%- include article-list.html articles=_articles type='brief' show_info=_show_info -%}
+
+    {%- else -%}
+      {%- include snippets/assign.html
+        target=site.data.variables.default.page.articles.show_cover
+        source0=layout.articles.show_cover source1=page.articles.show_cover -%}
+      {%- assign _show_cover = __return -%}
+
+      {%- include snippets/assign.html
+        target=site.data.variables.default.page.articles.show_excerpt
+        source0=layout.articles.show_excerpt source1=page.articles.show_excerpt -%}
+      {%- assign _show_excerpt = __return -%}
+
+      {%- include snippets/assign.html
+        target=site.data.variables.default.page.articles.show_readmore
+        source0=layout.articles.show_readmore source1=page.articles.show_readmore -%}
+      {%- assign _show_readmore = __return -%}
+
+      {%- include snippets/assign.html
+        target=site.data.variables.default.page.articles.show_info
+        source0=layout.articles.show_info source1=page.articles.show_info -%}
+      {%- assign _show_info = __return -%}
+
+      {%- assign _article_type = page.articles.article_type | default: layout.articles.article_type -%}
+      {%- assign _cover_size = page.articles.cover_size | default: layout.articles.cover_size -%}
+      {%- assign _excerpt_type = page.articles.excerpt_type | default: layout.articles.excerpt_type -%}
+
+      {%- include article-list.html articles=_articles type='item'
+        article_type=_article_type
+        show_cover=_show_cover cover_size=_cover_size
+        show_excerpt=_show_excerpt excerpt_type=_excerpt_type
+        show_readmore=_show_readmore show_info=_show_info -%}
+
+    {%- endif -%}
+
+  </div>
+{%- endif -%}
+
+{{ content }}