jekyll-text-theme 2.2.4 → 2.2.5

data/_data/variables.yml

@@ -31,17 +31,19 @@ default:
     show_date: true
     show_tags: true
     show_author_profile: false
+    show_subscribe: false
     full_width: false
     sharing: false
     comment: true
     license: false
     pageview: false
+    search: default
 
 sources:
   bootcdn:
     font_awesome: 'https://use.fontawesome.com/releases/v5.0.13/css/all.css'
     jquery: 'https://cdn.bootcss.com/jquery/3.1.1/jquery.min.js'
-    leancloud_js_sdk: '//cdn1.lncld.net/static/js/3.4.1/av-min.js'
+    leancloud_js_sdk: '//cdn.jsdelivr.net/npm/leancloud-storage@3.13.2/dist/av-min.js'
     chart: 'https://cdn.bootcss.com/Chart.js/2.7.2/Chart.bundle.min.js'
     gitalk:
       js: 'https://cdn.bootcss.com/gitalk/1.2.2/gitalk.min.js'
@@ -52,7 +54,7 @@ sources:
   unpkg:
     font_awesome: 'https://use.fontawesome.com/releases/v5.0.13/css/all.css'
     jquery: 'https://unpkg.com/jquery@3.3.1/dist/jquery.min.js'
-    leancloud_js_sdk: '//cdn1.lncld.net/static/js/3.4.1/av-min.js'
+    leancloud_js_sdk: '//cdn.jsdelivr.net/npm/leancloud-storage@3.13.2/dist/av-min.js'
     chart: 'https://unpkg.com/chart.js@2.7.2/dist/Chart.min.js'
     gitalk:
       js: 'https://unpkg.com/gitalk@1.2.2/dist/gitalk.min.js'

data/_includes/analytics-providers/custom.html

@@ -0,0 +1,3 @@
+<!-- start custom analytics snippet -->
+
+<!-- end custom analytics snippet -->

data/_includes/article-footer.html

@@ -0,0 +1,55 @@
+{%- 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.show_subscribe
+  source0=layout.show_subscribe source1=page.show_subscribe -%}
+{%- assign _show_subscribe = __return -%}
+
+{%- include snippets/assign.html
+  target=site.data.variables.default.page.license
+  source0=layout.license source1=page.license -%}
+{%- assign _license = __return -%}
+
+<footer class="article__footer">
+  {%- if page.modify_date -%}
+    {%- include snippets/get-locale-string.html key='ARTICLE_DATE_FORMAT' -%}
+    {%- assign _locale_date_format = __return -%}
+
+    {%- include snippets/get-locale-string.html key='LAST_UPDATED' -%}
+    {%- assign _locale_last_update = __return -%}
+    <span>{{ _locale_last_update }}
+      <time itemprop="dateModified" datetime="{{ page.modify_date | date_to_xmlschema }}">{{ page.modify_date | date: _locale_date_format }}</time>
+    </span>
+  {%- elsif page.date -%}
+    <meta itemprop="dateModified" content="{{ page.date | date_to_xmlschema }}">
+  {%- endif -%}
+
+  {%- include article/footer/custom.html -%}
+
+  {%- if _show_author_profile -%}
+    {%- if page.author -%}
+      {%- assign _author = site.data.authors[page.author] -%}
+    {%- else -%}
+      {%- assign _author = site.author -%}
+    {%- endif -%}
+    {%- include article/footer/author-profile.html author=_author -%}
+  {%- endif -%}
+
+  {%- if _show_subscribe -%}
+    <div class="article__subscribe">{%- include article/footer/subscribe.html -%}</div>
+  {%- endif -%}
+
+  {%- 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/_includes/article-header.html

@@ -22,7 +22,7 @@
         {%- if site.repository and site.repository_tree -%}
           {%- include snippets/is_collection.html page=include.article -%}
           {%- assign _is_article_collection = __return -%}
-          {%- include snippets/locale-to-string.html locale=site.data.locale.POST_ON_GITHUB -%}
+          {%- include snippets/get-locale-string.html key='POST_ON_GITHUB' -%}
           {%- assign _locale_post_on_github = __return -%}
           {%- if _is_article_collection -%}
             {%- include snippets/prepend-path.html path=include.article.path prepend_path=site.collections_dir -%}

data/_includes/article-info.html

@@ -62,14 +62,14 @@
 
           {%- if _show_date -%}
             <li>
-              {%- include snippets/locale-to-string.html locale=site.data.locale.ARTICLE_DATE_FORMAT -%}
+              {%- include snippets/get-locale-string.html key='ARTICLE_DATE_FORMAT' -%}
               <i class="far fa-calendar-alt"></i> <span>{{ include.article.date | date: __return }}</span>
             </li>
           {%- endif -%}
 
           {%- if _pageview -%}
             {%- if site.pageview.provider -%}
-              {%- include snippets/locale-to-string.html locale=site.data.locale.VIEWS -%}
+              {%- include snippets/get-locale-string.html key='VIEWS' -%}
               {%- assign _locale_views = __return -%}
               <li><i class="far fa-eye"></i> <span class="js-pageview" data-page-key="{{ include.article.key }}">0</span> {{ _locale_views }}</li>
             {%- endif -%}

data/_includes/article-list.html

@@ -2,7 +2,7 @@
 
 {%- assign _excerpt_type = include.excerpt_type -%}
 
-{%- include snippets/locale-to-string.html locale=site.data.locale.READMORE -%}
+{%- include snippets/get-locale-string.html key='READMORE' -%}
 {%- assign _locale_readmore = __return -%}
 
 {%- assign _sorted_list = include.articles -%}
@@ -18,7 +18,11 @@
 {%- elsif include.type == 'brief' -%}
 <div class="article-list items">
 {%- elsif include.type == 'grid' -%}
-<div class="article-list grid grid--p-3">
+  {%- if include.size == 'sm' -%}
+  <div class="article-list grid gird--sm grid--p-3">
+  {%- else -%}
+  <div class="article-list grid grid--p-3">
+  {%- endif -%}
 {%- endif -%}
 
   {%- for _article in _sorted_list -%}
@@ -51,7 +55,7 @@
           </div>
         {%- endif -%}
         <div class="item__content">
-          <header><h2 itemprop="headline" class="item__header"><a href="{{ _article_url }}">{{ _article.title }}</a></h2></header>
+          <header><a href="{{ _article_url }}"><h2 itemprop="headline" class="item__header">{{ _article.title }}</h2></a></header>
           <div class="item__description">
             {%- if _article.excerpt and include.show_excerpt -%}
               <div class="article__content" itemprop="description articleBody">
@@ -94,7 +98,7 @@
           {%- assign _date = _currentdate -%}
         {%- endif -%}
       {%- endif -%}
-      {%- include snippets/locale-to-string.html locale=site.data.locale.ARTICLE_LIST_DATE_FORMAT -%}
+      {%- include snippets/get-locale-string.html key='ARTICLE_LIST_DATE_FORMAT' -%}
       <li class="item" itemscope itemtype="http://schema.org/BlogPosting" data-tags="{{ _tags }}">
         <div class="item__content">
           {%- if include.show_info -%}
@@ -106,13 +110,13 @@
     {%- elsif include.type == 'grid' -%}
       {%- if include.size == 'sm' -%}
         <div class="cell cell--12 cell--md-4 cell--lg-3">
-          <div class="card">
+          <div class="card card--flat">
             {%- 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>
+                    <a href="{{ _article_url }}"><h2 class="card__header">{{ _article.title }}</h2></a>
                   </header>
                 </div>
               </div>
@@ -128,7 +132,7 @@
             {%- endif -%}
               <div class="card__content">
                 <header>
-                  <h2 class="card__header"><a href="{{ _article_url }}">{{ _article.title }}</a></h2>
+                  <a href="{{ _article_url }}"><h2 class="card__header">{{ _article.title }}</h2></a>
                 </header>
               </div>
           </div>

data/_includes/article-section-navigator.html

@@ -39,14 +39,14 @@
     {%- if _previous -%}
       {%- include snippets/prepend-baseurl.html path=_previous.url -%}
       {%- assign _href = __return -%}
-      {%- include snippets/locale-to-string.html locale=site.data.locale.PREVIOUS -%}
+      {%- include snippets/get-locale-string.html key='PREVIOUS' -%}
       {%- assign _locale_previous = __return -%}
       <div class="previous"><span>{{ _locale_previous }}</span><a href="{{ _href }}">{{ _previous.title }}</a></div>
     {%- endif -%}
     {%- if _next -%}
       {%- include snippets/prepend-baseurl.html path=_next.url -%}
       {%- assign _href = __return -%}
-      {%- include snippets/locale-to-string.html locale=site.data.locale.NEXT -%}
+      {%- include snippets/get-locale-string.html key='NEXT' -%}
       {%- assign _locale_next = __return -%}
       <div class="next"><span>{{ _locale_next }}</span><a href="{{ _href }}">{{ _next.title }}</a></div>
     {%- endif -%}

data/_includes/article/footer/custom.html

@@ -0,0 +1,3 @@
+<!-- start custom article footer snippet -->
+
+<!-- end custom article footer snippet -->

data/_includes/{article-footer → article/footer}/license.html

@@ -1,4 +1,4 @@
-{%- include snippets/locale-to-string.html locale=site.data.locale.LICENSE_ANNOUNCE -%}
+{%- include snippets/get-locale-string.html key='LICENSE_ANNOUNCE' -%}
 {%- assign _license_announce = __return -%}
 
 {%- if include.license -%}

data/_includes/article/footer/subscribe.html

@@ -0,0 +1,6 @@
+{%- assign _paths_rss = site.paths.rss | default: site.data.variables.default.paths.rss -%}
+{%- include snippets/get-nav-url.html path=_paths_rss -%}
+{%- assign _paths_rss = __return -%}
+{%- include snippets/get-locale-string.html key='SUBSCRIBE' -%}
+{%- assign _locale_nav_subscribe = __return -%}
+<div class="subscribe"><i class="fas fa-rss"></i> <a type="application/rss+xml" href="{{ _paths_rss }}">{{ _locale_nav_subscribe }}</a></div>

data/_includes/article/top/custom.html

@@ -0,0 +1,3 @@
+<!-- start custom article top snippet -->
+
+<!-- end custom article top snippet -->

data/_includes/author-links.html

@@ -7,26 +7,29 @@
       <link itemprop="url" href="{{ _author.url }}">
     {%- endif -%}
 
-    {%- include snippets/locale-to-string.html locale=site.data.locale.EMAIL_ME -%}
+    {%- if _author.type == 'organization' -%}
+      {%- include snippets/get-locale-string.html key='EMAIL_US' -%}
+      {%- assign _locale_string_email = __return -%}
+      {%- include snippets/get-locale-string.html key='FOLLOW_US' -%}
+      {%- assign _locale_string_follow = __return -%}
+    {%- else -%}
+      {%- include snippets/get-locale-string.html key='EMAIL_ME' -%}
+      {%- assign _locale_string_email = __return -%}
+      {%- include snippets/get-locale-string.html key='FOLLOW_ME' -%}
+      {%- assign _locale_string_follow = __return -%}
+    {%- endif -%}
+
+    {%- include snippets/get-locale-string.html key='EMAIL_ME' -%}
     {%- if _author.email -%}
-      <li title="{{ __return }}">
+      <li title="{{ _locale_string_email }}">
       <a class="button button--circle mail-button" itemprop="email" href="mailto:{{ _author.email }}" target="_blank">
         <i class="fas fa-envelope"></i>
       </a>
     {%- endif -%}
 
-    {%- include snippets/locale-to-string.html locale=site.data.locale.FOLLOW_ME -%}
-
-    {%- if _author.weibo -%}
-      <li title="{{ __return | replace: '[NAME]', 'Weibo' }}">
-        <a class="button button--circle weibo-button" itemprop="sameAs" href="https://weibo.com/{{ _author.weibo }}" target="_blank">
-          <div class="icon">{%- include svg/icon/social/weibo.svg -%}</div>
-        </a>
-      </li>
-    {%- endif -%}
 
     {%- if _author.facebook -%}
-      <li title="{{ __return | replace: '[NAME]', 'Facebook' }}">
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Facebook' }}">
         <a class="button button--circle facebook-button" itemprop="sameAs" href="https://www.facebook.com/{{ _author.facebook }}" target="_blank">
           <div class="icon">{%- include svg/icon/social/facebook.svg -%}</div>
         </a>
@@ -34,59 +37,84 @@
     {%- endif -%}
 
     {%- if _author.twitter -%}
-      <li title="{{ __return | replace: '[NAME]', 'Twitter' }}">
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Twitter' }}">
         <a class="button button--circle twitter-button" itemprop="sameAs" href="https://twitter.com/{{ _author.twitter }}" target="_blank">
           <div class="icon">{%- include svg/icon/social/twitter.svg -%}</div>
         </a>
       </li>
     {%- endif -%}
 
+    {%- if _author.weibo -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Weibo' }}">
+        <a class="button button--circle weibo-button" itemprop="sameAs" href="https://weibo.com/{{ _author.weibo }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/weibo.svg -%}</div>
+        </a>
+      </li>
+    {%- endif -%}
+
     {%- if _author.googleplus -%}
-      <li title="{{ __return | replace: '[NAME]', 'Google+' }}">
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Google+' }}">
         <a class="button button--circle googlepluse-button" itemprop="sameAs" href="https://plus.google.com/u/0/{{ _author.googleplus }}" target="_blank">
           <div class="icon">{%- include svg/icon/social/googleplus.svg -%}</div>
         </a>
       </li>
     {%- endif -%}
 
-    {%- if _author.github -%}
-      <li title="{{ __return | replace: '[NAME]', 'Github' }}">
-        <a class="button button--circle github-button" itemprop="sameAs" href="https://github.com/{{ _author.github }}" target="_blank">
-          <div class="icon">{%- include svg/icon/social/github.svg -%}</div>
+    {%- if _author.telegram -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Telegram' }}">
+        <a class="button button--circle telegram-button" itemprop="sameAs" href="https://t.me/{{ _author.telegram }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/telegram.svg -%}</div>
         </a>
       </li>
     {%- endif -%}
 
-    {%- if _author.linkedin -%}
-      <li title="{{ __return | replace: '[NAME]', 'Linkedin' }}">
-        <a class="button button--circle linkedin-button" itemprop="sameAs" href="https://www.linkedin.com/in/{{ _author.linkedin }}" target="_blank">
-          <div class="icon">{%- include svg/icon/social/linkedin.svg -%}</div>
+    {%- if _author.medium -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Medium' }}">
+        <a class="button button--circle medium-button" itemprop="sameAs" href="https://medium.com/{{ _author.medium }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/medium.svg -%}</div>
+        </a>
+      </li>
+    {%- endif -%}
+
+    {%- if _author.zhihu -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Zhihu' }}">
+        <a class="button button--circle zhihu-button" itemprop="sameAs" href="https://www.zhihu.com/people/{{ _author.zhihu }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/zhihu.svg -%}</div>
         </a>
       </li>
     {%- endif -%}
 
     {%- if _author.douban -%}
-      <li title="{{ __return | replace: '[NAME]', 'Douban' }}">
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Douban' }}">
         <a class="button button--circle douban-button" itemprop="sameAs" href="https://www.douban.com/people/{{ _author.douban }}" target="_blank">
           <div class="icon">{%- include svg/icon/social/douban.svg -%}</div>
         </a>
       </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>
+    {%- if _author.linkedin -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Linkedin' }}">
+        <a class="button button--circle linkedin-button" itemprop="sameAs" href="https://www.linkedin.com/in/{{ _author.linkedin }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/linkedin.svg -%}</div>
         </a>
       </li>
     {%- endif -%}
 
-    {%- if _author.telegram -%}
-      <li title="{{ __return | replace: '[NAME]', 'Telegram' }}">
-        <a class="button button--circle telegram-button" itemprop="sameAs" href="https://t.me/{{ _author.telegram }}" target="_blank">
-          <div class="icon">{%- include svg/icon/social/telegram.svg -%}</div>
+    {%- if _author.github -%}
+      <li title="{{ _locale_string_follow | replace: '[NAME]', 'Github' }}">
+        <a class="button button--circle github-button" itemprop="sameAs" href="https://github.com/{{ _author.github }}" target="_blank">
+          <div class="icon">{%- include svg/icon/social/github.svg -%}</div>
+        </a>
+      </li>
+    {%- endif -%}
+
+    {%- if _author.npm -%}
+      <li title="{{ _locale_string_follow | 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/comments-providers/custom.html

@@ -0,0 +1,3 @@
+<!-- start custom comments snippet -->
+
+<!-- end custom comments snippet -->

data/_includes/comments-providers/gitalk.html

@@ -5,9 +5,16 @@
 	site.comments.gitalk.owner and
 	site.comments.gitalk.admin -%}
 
+	<!-- fix text color in the input textarea of gitalk -->
+	<style type="text/css">
+		.gitalk-wrapper .gt-header-textarea {
+			color: #333 !important;
+		}
+	</style>
+
 	{%- include snippets/get-sources.html -%}
 	{%- assign _sources = __return -%}
-	<div id="js-gitalk-container"></div>
+	<div class="gitalk-wrapper" id="js-gitalk-container"></div>
 	{%- assign _admin = '' -%}
 	{%- for _admin_id in site.comments.gitalk.admin -%}
 		{%- assign _admin = _admin | append: ", '" | append: _admin_id | append: "'" -%}

data/_includes/comments-providers/valine.html

@@ -4,13 +4,20 @@
 {%- assign _VALINE_APP_ID = site.comments.valine.app_id -%}
 {%- assign _VALINE_APP_KEY = site.comments.valine.app_key -%}
 {%- assign _VALINE_PLACEHOLDER = site.comments.valine.placeholder -%}
+{%- assign _VALINE_VISITOR = site.comments.valine.visitor -%}
+{%- assign _VALINE_META = site.comments.valine.meta -%}
 
 
-{%- if page.key and
-  _VALINE_APP_ID and
+{%- if _VALINE_APP_ID and
   _VALINE_APP_KEY -%}
 
 <div id="vcomments"></div>
+
+{%- if _VALINE_VISITOR -%}    
+<span id="{{page.url}}" class="leancloud-visitors" data-flag-title={{page.title}}>
+</span>
+{%- endif -%}
+
 <script>
   window.Lazyload.js(['{{ _sources.leancloud_js_sdk}}', '{{ _sources.valine }}'], function() {
     var _config = {
@@ -25,6 +32,12 @@
     {%- assign _page_lang_slice =  page.lang | slice: 0, 2 -%}
     {%- if _page_lang_slice != 'zh'  -%}
       _config.lang = 'en';
+    {%- endif -%}  
+    {%- if _VALINE_VISITOR -%}
+      _config.visitor = 'true';
+    {%- endif -%}
+    {%- if _VALINE_META -%}
+      _config.meta = {{ _VALINE_META}};
     {%- endif -%}
     new Valine(_config);
   });

data/_includes/footer.html

@@ -1,5 +1,5 @@
 
-<div class="footer js-page-footer">
+<footer class="footer py-4 js-page-footer">
   <div class="main">
 
     {%- assign _site_author = site.author -%}
@@ -9,7 +9,7 @@
       {%- assign _site_author_itemtype = 'http://schema.org/Person' -%}
     {%- endif -%}
 
-    <aside  itemscope itemtype="{{ _site_author_itemtype }}">
+    <div itemscope itemtype="{{ _site_author_itemtype }}">
       <meta itemprop="name" content="{{ _site_author.name }}">
       {%- assign _site_author_url = _site_author.url | default: '/'-%}
       {%- include snippets/get-nav-url.html path=_site_author_url -%}
@@ -21,20 +21,17 @@
       <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 -%}
-      {%- include snippets/get-nav-url.html path=_paths_rss -%}
-      {%- assign _paths_rss = __return -%}
-      {%- include snippets/locale-to-string.html locale=site.data.locale.NAV.RSS -%}
-      {%- assign _locale_nav_rss = __return -%}
-      <p class="menu menu--center">
-        <span>© {{ site.title }} {{ site.data.locale.COPYRIGHT_DATES }}</span>
-        <a type="application/rss+xml" href="{{ _paths_rss }}">{{ _locale_nav_rss }}</a>
-      </p>
-      <p>Powered by <a title="Jekyll is a simple, blog-aware, static site generator." href="http://jekyllrb.com/">Jekyll</a> & <a
-        title="TeXt is a succinct theme for blogging." href="https://github.com/kitian616/jekyll-TeXt-theme">TeXt Theme</a>.
-      </p>
-    </footer>
+    </div>
+    {%- include snippets/get-locale-string.html key='COPYRIGHT_DATES' -%}
+    {%- assign _locale_copyright_dates = __return -%}
+    <div class="site-info mt-2">
+      <div>
+        {%- include snippets/get-locale-string.html key='COPYRIGHT_DATES' -%}
+        {%- assign _locale_copyright_dates = __return -%}
+        © {{ site.title }} {{ _locale_copyright_dates }},
+        Powered by <a title="Jekyll is a simple, blog-aware, static site generator." href="http://jekyllrb.com/">Jekyll</a> & <a
+        title="TeXt is a super customizable Jekyll theme." href="https://github.com/kitian616/jekyll-TeXt-theme">TeXt Theme</a>.
+      </div>
+    </div>
   </div>
-</div>
+</footer>