jekyll-text-theme 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2ae404cd71049373be71e77b4e6b49722cff9c
-  data.tar.gz: 671c1dc0fe48624aa30d2cea2495969e499ca8bc
+  metadata.gz: 14c04996b1129a62fc3ff58d0bb57e110dc0319f
+  data.tar.gz: f452946f4ab9eb877ef00d9e68bf0de94d54ba20
 SHA512:
-  metadata.gz: d142b51db0bff8f34498fe524fcad922baa8c4ba4fd8478fdfa3b9e2ffdf31bf53b8439d69cc1eeed6ec62b9c74d1eb0387f79282010cec9090247102cf68417
-  data.tar.gz: 85f644f5def91d033c514e43210bbb858019709d31268520bdbad4c6a38623de2944aa16554dbd52fce9fa7effba058e2d4e774d16df3ae8072d74cfdaf367f3
+  metadata.gz: ad3852f278e417abf9e263d8bc8b95c9bff1e7db6a8f5da6569d60a39e6c531ffdb44197a69fe6888aa3fff32c6b09109131a4051bc9508c5695faf3b9abcd92
+  data.tar.gz: f881cc2df0868bb6f3245eb5ab7e6b5e950091f3e0e599105715c77d625fdb2cc224299fbcac6eea6a0fe1ba74e7ba3599732fd32a1b85f0bc585c3f83c26a88

data/README.md

@@ -8,9 +8,9 @@
 
 ![TeXt Theme Details](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/TeXt-layouts.png)
 
-TeXt is a Jekyll theme for personal site, team site, blog, project, documentation, etc. Similar to iOS 11 style, it has large and prominent titles, round buttons and cards.
+TeXt is a customizable Jekyll theme for personal site, team site, blog, project, documentation, etc. Similar to iOS 11 style, it has large and prominent titles, round buttons and cards.
 
-[中文文档](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README-zh.md)
+[Change Log](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/CHANGELOG.md) | [中文文档](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README-zh.md)
 
 ## Features
 

data/_data/locale.yml

@@ -21,6 +21,18 @@ READMORE:
   zh-Hans: "阅读更多"
   zh-Hant: "閱讀更多"
 
+SEARCH:
+  en:      "Search"
+  zh:      "搜索"
+  zh-Hans: "搜索"
+  zh-Hant: "搜索"
+
+CANCEL:
+  en:      "Cancel"
+  zh:      "取消"
+  zh-Hans: "取消"
+  zh-Hant: "取消"
+
 VIEWS:
   en:      "views"
   zh:      "阅读"

data/_includes/analytics-providers/google.html

@@ -1,16 +1,14 @@
 {%- if site.analytics.google.tracking_id -%}
-
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.analytics.google.tracking_id }}"></script>
 	<script>
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		window.dataLayer = window.dataLayer || [];
+		function gtag(){dataLayer.push(arguments);}
+		gtag('js', new Date());
 
-		ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
-		ga('send', 'pageview');
+		gtag('config', '{{ site.analytics.google.tracking_id }}');
 		{% if site.analytics.google.anonymize_ip == true %}
-		ga('set', 'anonymizeIp', true);
+			gtag('config', '{{ site.analytics.google.tracking_id }}', { 'anonymize_ip': true });
 		{% endif %}
 	</script>
-
 {%- endif -%}

data/_includes/article-info.html

@@ -1,16 +1,10 @@
-{%- if post -%}
-  {%- assign _cur_page = post -%}
-{%- elsif page -%}
-  {%- assign _cur_page = page -%}
-{%- endif -%}
-
 {%- include snippets/assign.html target=site.data.variables.default.pageview source0=page.pageview -%}
 {%- assign _pageview = __return -%}
 
 {%- assign _paths_archive = site.paths.archive | default: site.data.variables.default.paths.archive -%}
 
-{%- if _cur_page.author -%}
-  {%- assign _author = site.data.authors[_cur_page.author] -%}
+{%- if include.article.author -%}
+  {%- assign _author = site.data.authors[include.article.author] -%}
 {%- else -%}
   {%- assign _author = site.author -%}
 {%- endif -%}
@@ -22,57 +16,47 @@
     <meta itemprop="author" content="{{ _author.name }}"/>
   {%- endif -%}
 
-  {%- if _cur_page.tags[0] -%}
+  {%- if include.article.tags[0] -%}
     <ul class="left-col menu">
 
-      {%- assign _keywords = '' -%}
-      {%- for _tag in _cur_page.tags -%}
+      {%- assign _tag_path = _paths_archive | append: '?tag=' -%}
+      {%- include snippets/prepend-baseurl.html path=_tag_path -%}
+
+      {%- for _tag in include.article.tags -%}
+        {%- assign _tag_path = __return -%}
         {%- assign _tag_encode = _tag | strip | url_encode } -%}
-        {%- if forloop.last -%}
-          {%- assign _keywords = _keywords | append: _tag -%}
-        {%- else -%}
-          {%- assign _keywords = _keywords | append: _tag | append: ',' -%}
-        {%- endif -%}
-        {%- assign _tag_path = _paths_archive | append: '?tag=' -%}
-        {%- include snippets/prepend-baseurl.html path=_tag_path -%}
         <li>
           <a class="button button--secondary button--pill button--sm"
-            href="{{ __return | append: _tag_encode | replace: '//', '/' }}">{{ _tag }}</a>
+            href="{{ _tag_path | append: _tag_encode | replace: '//', '/' }}">{{ _tag }}</a>
         </li>
       {%- endfor -%}
-      <meta itemprop="keywords" content="{{ _keywords }}">
+      {%- assign _keywords = include.article.tags | join: ',' %}
     </ul>
+    <meta itemprop="keywords" content="{{ _keywords }}">
   {%- endif -%}
 
 
-  {%- if (_pageview or post) or _cur_page.date -%}
+  {%- if include.article.author or include.article.date or _pageview or post -%}
     <ul class="right-col menu">
-      {%- if !_cur_page.author -%}
-        <li><i class="fas fa-user"></i>  <span>{{ _author.name }}</span></li>
+      {%- if include.article.author -%}
+        <li><i class="fas fa-user"></i> <span>{{ _author.name }}</span></li>
       {%- endif -%}
 
-      {%- if _cur_page.date -%}
+      {%- if include.article.date -%}
         <li>
           {%- include snippets/locale-to-string.html locale=site.data.locale.ARTICLE_DATE_FORMAT -%}
-          {%- if post -%}
-            <i class="far fa-calendar-alt"></i> <span itemprop="datePublished">{{ _cur_page.date | date: __return }}</span>
-          {%- elsif page -%}
-            <i class="far fa-calendar-alt"></i> <time datetime="{{ page.date | date_to_xmlschema }}"
-              itemprop="datePublished">{{ _cur_page.date | date: __return }}
-            </time>
-          {%- endif -%}
+          <i class="far fa-calendar-alt"></i> <span>{{ include.article.date | date: __return }}</span>
+          <meta itemprop="datePublished" content="{{ include.article.date | date_to_xmlschema }}">
         </li>
       {%- endif -%}
 
-      {%- if _pageview or post -%}
+      {%- if _pageview or include.show_pageview -%}
         {%- if site.pageview.provider -%}
-
           {%- include snippets/locale-to-string.html locale=site.data.locale.VIEWS -%}
           {%- assign _locale_views = __return -%}
-
           <li itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
             <link itemprop="interactionType" href="http://schema.org/WatchAction"/>
-            <i class="far fa-eye"></i> <span class="js-pageview" data-page-key="{{ _cur_page.key }}">0</span> {{ _locale_views }}
+            <i class="far fa-eye"></i> <span class="js-pageview" data-page-key="{{ include.article.key }}">0</span> {{ _locale_views }}
           </li>
         {%- endif -%}
       {%- endif -%}

data/_includes/article-list.html

@@ -0,0 +1,73 @@
+{%- assign _excerpt_truncate = include.excerpt_truncate | default: 350 -%}
+
+{%- assign _excerpt_type = include.excerpt_type | default: site.data.variables.default.excerpt_type  -%}
+
+{%- assign _sorted_list = include.articles -%}
+{%- if include.group_by == 'year' -%}
+  {%- assign _sorted_list = _sorted_list | sort: 'date' -%}
+{%- endif -%}
+{%- if include.reverse -%}
+  {%- assign _sorted_list = _sorted_list | reverse -%}
+{%- endif -%}
+
+{%- if include.type == 'common' -%}
+<div class="items items--divided">
+{%- elsif include.type == 'brief' -%}
+<div class="items">
+{%- endif -%}
+
+  {%- for _article in _sorted_list -%}
+
+    {%- include snippets/prepend-baseurl.html path=_article.url -%}
+    {%- assign _href = __return -%}
+
+    {%- include snippets/locale-to-string.html locale=site.data.locale.READMORE -%}
+    {%- assign _locale_readmore = __return -%}
+
+    {%- if include.type == 'common' -%}
+      <article class="item" itemscope itemtype="http://schema.org/BlogPosting">
+        <div class="item__content">
+          <header><h2 itemprop="headline" class="item__header"><a href="{{ _href }}">{{ _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 }}
+                {%- endif -%}
+              </div>
+            {%- endif -%}
+            <p><a href="{{ _href }}">{{ _locale_readmore }}</a></p>
+          </div>
+          {%- include article-info.html article=_article show_pageview=true -%}
+        </div>
+      </article>
+
+
+    {%- elsif include.type == 'brief' -%}
+      {%- assign _tags = '' -%}
+      {%- for _tag in _article.tags -%}
+        {%- assign _tag_encode = _tag | strip | url_encode } -%}
+        {%- if forloop.last -%}
+          {%- assign _tags = _tags | append: _tag_encode -%}
+        {%- else -%}
+          {%- assign _tags = _tags | append: _tag_encode | append: ',' -%}
+        {%- endif -%}
+      {%- endfor -%}
+      {%- if include.group_by == 'year' -%}
+        {%- assign _currentdate = _article.date | date: '%Y' -%}
+        {%- if _currentdate != _date -%}
+          {%- unless forloop.first -%}</ul></section>{%- endunless -%}
+          <section><h2 class="article-list__group-header">{{ _currentdate }}</h2><ul>
+          {%- assign _date = _currentdate -%}
+        {%- endif -%}
+      {%- 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>
+      </li>
+    {%- endif -%}
+
+  {%- endfor -%}
+</div>

data/_includes/author-links.html

@@ -74,5 +74,12 @@
       </li>
     {%- endif -%}
 
+    {%- if _author.npm -%}
+      <li title="{{ __return | replace: '[NAME]', 'npm' }}">
+        <a class="button button--circle npm-button" itemprop="sameAs" href="https://www.npmjs.com/~{{ _author.npm }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/npm.svg -%}</div>
+        </a>
+      </li>
+    {%- endif -%}
   </ul>
 </div>

data/_includes/header.html

@@ -1,15 +1,18 @@
 <header class="header">
-  <div class="main clearfix">
-    <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 -%}
+  <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 -%}
+      </div>
+      <button class="button button--secondary button--circle search-button js-search-toggle"><i class="fas fa-search"></i></button>
     </div>
     {%- if site.data.navigation.header -%}
-    <nav>
+    <nav class="navigation">
       <ul>
         {%- for _item in site.data.navigation.header -%}
           {%- include snippets/get-nav-url.html path=_item.url -%}
@@ -23,6 +26,7 @@
             <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 -%}

data/_includes/markdown-enhancements.html

@@ -1,18 +1,18 @@
-{%- include snippets/assign.html target = site.data.variables.default.chart source0=site.chart -%}
+{%- include snippets/assign.html target=site.data.variables.default.chart source0=site.chart -%}
 {%- include snippets/assign.html target=__return source0=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=site.data.variables.default.mathjax source0=site.mathjax -%}
 {%- include snippets/assign.html target=__return source0=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=site.data.variables.default.mermaid source0=site.mermaid -%}
 {%- include snippets/assign.html target=__return source0=page.mermaid -%}
 
 {%- if __return == true -%}

data/_includes/paginator.html

@@ -1,5 +1,5 @@
 {%- if paginator.total_pages > 1 -%}
-  <nav class="pagination">
+  <div class="pagination">
 
     {%- include snippets/locale-to-string.html locale=site.data.locale.STATISTICS -%}
     {%- assign _locale_statistics = __return -%}
@@ -7,63 +7,70 @@
     {%- assign _post_count = site.posts | size -%}
     {%- assign _page_count = paginator.total_pages -%}
     <p>{{ _locale_statistics | replace: '[POST_COUNT]', _post_count | replace: '[PAGE_COUNT]', _page_count }}</p>
+    <div class="pagination__menu">
+      <ul class="menu menu--nowrap">
+        {%- assign _max_show = 5 -%}
+        {%- assign _max_show_modulo_two = _max_show | modulo: 2 -%}
+        {%- assign _length = paginator.total_pages -%}
+        {%- assign _length_mimus_one = _length | minus: 1 -%}
+        {%- assign _cur = paginator.page -%}
+        {%- assign _extra = _max_show | minus: 3 -%}
+        {%- assign _extra_half = _extra | divided_by: 2 -%}
 
-    <ul class="menu menu--nowrap">
-      {%- assign _max_show = 5 -%}
-      {%- assign _max_show_modulo_two = _max_show | modulo: 2 -%}
-      {%- assign _length = paginator.total_pages -%}
-      {%- assign _length_mimus_one = _length | minus: 1 -%}
-      {%- assign _cur = paginator.page -%}
-      {%- assign _extra = _max_show | minus: 3 -%}
-      {%- assign _extra_half = _extra | divided_by: 2 -%}
+        {%- if  _max_show > 4 and _max_show_modulo_two == 1 and paginator.total_pages > _max_show -%}
+          {%- assign _condition0 = _extra | divided_by: 2 | plus: 1 -%}
+          {%- assign _condition1 = _length | minus: _extra_half  -%}
+          {%- if _cur <= _condition0 -%}
+            {%- assign _n0 = 2 -%}
+            {%- assign _n1 = _extra | plus: 2 -%}
+          {%- elsif _cur >= _condition1 -%}
+            {%- assign _n0 = _length | minus: _extra | minus: 1 -%}
+            {%- assign _n1 = _length | minus: 1 -%}
+          {%- else -%}
+            {%- assign _n0 = _cur | minus: _extra_half -%}
+            {%- assign _n1 = _cur | plus: _extra_half -%}
+          {%- endif -%}
+        {%- endif -%}
 
-      {%- if  _max_show > 4 and _max_show_modulo_two == 1 and paginator.total_pages > _max_show -%}
-        {%- assign _condition0 = _extra | divided_by: 2 | plus: 1 -%}
-        {%- assign _condition1 = _length | minus: _extra_half  -%}
-        {%- if _cur <= _condition0 -%}
-          {%- assign _n0 = 2 -%}
-          {%- assign _n1 = _extra | plus: 2 -%}
-        {%- elsif _cur >= _condition1 -%}
-          {%- assign _n0 = _length | minus: _extra | minus: 1 -%}
-          {%- assign _n1 = _length | minus: 1 -%}
+        {%- if paginator.previous_page -%}
+          {%- include snippets/prepend-baseurl.html path=paginator.previous_page_path -%}
+          {%- assign _href = __return -%}
+          <li><a class="button button--secondary button--circle" href="{{ _href }}">
+            <i class="fas fa-angle-left"></i>
+          </a></li>
         {%- else -%}
-          {%- assign _n0 = _cur | minus: _extra_half -%}
-          {%- assign _n1 = _cur | plus: _extra_half -%}
+          <li><div class="button button--secondary button--circle disabled">
+            <i class="fas fa-angle-left"></i>
+          </div></li>
         {%- endif -%}
-      {%- endif -%}
-
-      {%- if paginator.previous_page -%}
-        {%- include snippets/prepend-baseurl.html path=paginator.previous_page_path -%}
-        {%- assign _href = __return -%}
-        <li><a class="button button--secondary button--circle" href="{{ _href }}">
-          <i class="fas fa-angle-left"></i>
-        </a></li>
-      {%- else -%}
-        <li><div class="button button--secondary button--circle disabled">
-          <i class="fas fa-angle-left"></i>
-        </div></li>
-      {%- endif -%}
 
-      {%- for page in (1.._length) -%}
-        {%- if page == _cur -%}
-          <li>
-            <div class="button button--primary button--circle focus"><span>{{ page }}</span></div>
-          </li>
+        {%- for page in (1.._length) -%}
+          {%- if page == _cur -%}
+            <li>
+              <div class="button button--primary button--circle focus"><span>{{ page }}</span></div>
+            </li>
 
-        {%- elsif page == 1 -%}
-          {%- assign _home_path = site.paths.home | default: site.data.variables.default.paths.home -%}
-          {%- include snippets/prepend-baseurl.html path=_home_path -%}
-          {%- assign _href = __return -%}
-          <li>
-            <a class="button button--secondary button--circle" href="{{ _href }}"><span>{{ page }}</span></a>
-          </li>
+          {%- elsif page == 1 -%}
+            {%- assign _home_path = site.paths.home | default: site.data.variables.default.paths.home -%}
+            {%- include snippets/prepend-baseurl.html path=_home_path -%}
+            {%- assign _href = __return -%}
+            <li>
+              <a class="button button--secondary button--circle" href="{{ _href }}"><span>{{ page }}</span></a>
+            </li>
 
-        {%- else -%}
-          {%- if _n0 and _n1 -%}
-            {%- if page > 1 and page < _n0 -%}
-              {%- if page == 2 -%}<li><span class="pagination__omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
-            {%- elsif page > _n1 and page < _length -%}
-              {%- if page == _length_mimus_one -%}<li><span class="omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
+          {%- else -%}
+            {%- if _n0 and _n1 -%}
+              {%- if page > 1 and page < _n0 -%}
+                {%- if page == 2 -%}<li><span class="pagination__omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
+              {%- elsif page > _n1 and page < _length -%}
+                {%- if page == _length_mimus_one -%}<li><span class="pagination__omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
+              {%- else -%}
+                {%- include snippets/prepend-baseurl.html path=site.paginate_path -%}
+                {%- assign _href = __return -%}
+                <li>
+                  <a class="button button--secondary button--circle" href="{{ _href | replace: ':num', page }}"><span>{{ page }}</span></a>
+                </li>
+              {%- endif -%}
             {%- else -%}
               {%- include snippets/prepend-baseurl.html path=site.paginate_path -%}
               {%- assign _href = __return -%}
@@ -71,27 +78,21 @@
                 <a class="button button--secondary button--circle" href="{{ _href | replace: ':num', page }}"><span>{{ page }}</span></a>
               </li>
             {%- endif -%}
-          {%- else -%}
-            {%- include snippets/prepend-baseurl.html path=site.paginate_path -%}
-            {%- assign _href = __return -%}
-            <li>
-              <a class="button button--secondary button--circle" href="{{ _href | replace: ':num', page }}"><span>{{ page }}</span></a>
-            </li>
           {%- endif -%}
-        {%- endif -%}
-      {%- endfor -%}
+        {%- endfor -%}
 
-      {%- if paginator.next_page -%}
-        {%- include snippets/prepend-baseurl.html path=paginator.next_page_path -%}
-        {%- assign _href = __return -%}
-        <li><a class="button button--secondary button--circle" href="{{ _href }}">
-          <i class="fas fa-angle-right"></i>
-        </a></li>
-      {%- else -%}
-        <li><div class="button button--secondary button--circle disabled">
-          <i class="fas fa-angle-right"></i>
-        </div></li>
-      {%- endif -%}
-    </ul>
-  </nav>
+        {%- if paginator.next_page -%}
+          {%- include snippets/prepend-baseurl.html path=paginator.next_page_path -%}
+          {%- assign _href = __return -%}
+          <li><a class="button button--secondary button--circle" href="{{ _href }}">
+            <i class="fas fa-angle-right"></i>
+          </a></li>
+        {%- else -%}
+          <li><div class="button button--secondary button--circle disabled">
+            <i class="fas fa-angle-right"></i>
+          </div></li>
+        {%- endif -%}
+      </ul>
+    </div>
+  </div>
 {%- endif -%}