jekyll-text-theme 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f2d075d52f39b7f1f666f33431d77c37616924
-  data.tar.gz: 821108795e874faecccd52c61a1ac6a8f3d87e07
+  metadata.gz: 93c347fb53eec2e1bda0852209a9049932e2d60e
+  data.tar.gz: ddaee6e856ae386f598f4ae358b7346caeef4c26
 SHA512:
-  metadata.gz: cec66f49278e3556e830715cfc7a08a7913744ba3b9517d2c28fc286bc0a27ae190ea9181f49d9d6f92849bb3509d406978b371938aaed61bc7be617cde0c9a2
-  data.tar.gz: 4125d29ba1794a15734b7da0b977f273d0cb8cf606149f7be7047add338668028f7d6c3d8e0ee15db08bc331eda1838fa737d238b2d0a5d6ce348e56418e8118
+  metadata.gz: 912a7e1d30414c5af48861d85be7be7fba4284eb8c5b169b9d0e83922b8b1a5c91137995c7276694af268a0568376e49d7e1f9c6a0d783ec4ff2727f60fac783
+  data.tar.gz: 92667fb44eebd026105e1f4e1cd46eb0af28b9cd40eea63193e40830e843c6d760128c5572f91d17452f48f08adef21ef42366dd65767453bd60808c94df57f1

data/README.md

@@ -24,13 +24,14 @@ TeXt 是针对博客的一款简洁的主题，它虽然简洁但并不简单。
 - 文章标签
 - 阅读次数统计（[LeanCloud](https://leancloud.cn/)）
 - Emoji（[Jemoji](https://github.com/jekyll/jemoji)）
-- 评论（[Disqus](https://disqus.com/)）
+- 评论（[Disqus](https://disqus.com/), [gitalk](https://gitalk.github.io/)）
 - Google Analytics
 - 联系方式设置（Email, Facebook, Twitter, 微博, 知乎……）
 - Web 语意化
 - 网站图标的自动化工具（[gulp-svg2png](https://www.npmjs.com/package/gulp-svg2png), [gulp-to-ico](https://www.npmjs.com/package/gulp-to-ico)）
 - Color Theme
 - 数学公式（[MathJax](https://www.mathjax.org/)）
+- 流程图， 序列图，甘特图（[mermaid](https://mermaidjs.github.io/)）
 - RSS（[jekyll-feed](https://github.com/jekyll/jekyll-feed)）
 - 多语言支持（English | 简体中文 | 繁體中文）
 
@@ -140,7 +141,15 @@ bundle exec jekyll serve -H 0.0.0.0
 
 ### 评论系统
 
-在 ./\_config.yml 文件的 `disqus.shortname` 项填上你在 [Disqus](https://disqus.com/) 上为网站建立的 site 对应的 shortname，需要注意的是 Disqus 在大陆是无法直接访问的。
+目前支持 Disqus 和 gitalk 评论系统，优先使用 Disqus。
+
+#### Disqus
+
+在 ./\_config.yml 文件的 `disqus.shortname` 项填上你在 [Disqus](https://disqus.com/) 上为网站建立的 site 对应的 shortname 即可，需要注意的是 Disqus 在大陆是无法直接访问的。
+
+#### gitalk
+
+在 ./\_config.yml 文件的 `gitalk` 的子项（`clientID`,`clientSecret`, `repository`, `owner`, `admin`）填上 gitalk 的对应参数 即可，详见 [gitalk 中文文档](https://github.com/gitalk/gitalk/blob/master/readme-cn.md)。
 
 > 注意：使用评论系统必须在文章的头信息中设置 key 值（可用字符集：`字母`、`数字` 及 `- _ : .`）。
 

data/_data/locale.yml

@@ -21,7 +21,7 @@ READMORE:
   zh-Hans: "点我阅读更多..."
   zh-Hant: "「點我閱讀更多」"
 
-COPYRIGHT_DATES: "2015 - 2017"
+COPYRIGHT_DATES: "2018"
 
 LAST_UPDATED:
   en:      "Last updated"
@@ -43,9 +43,9 @@ ARTICLE_LIST_DATE_FORMAT:
 
 STATISTICS:
   en:      "[POST_COUNT] post articles, [PAGE_COUNT] pages."
-  zh:      "共计 [POST_COUNT] 篇文章, [PAGE_COUNT] 页。"
-  zh-Hans: "共计 [POST_COUNT] 篇文章, [PAGE_COUNT] 页。"
-  zh-Hant: "共計 [POST_COUNT] 篇文章, [PAGE_COUNT] 頁。"
+  zh:      "共计 [POST_COUNT] 篇文章，[PAGE_COUNT] 页。"
+  zh-Hans: "共计 [POST_COUNT] 篇文章，[PAGE_COUNT] 页。"
+  zh-Hant: "共計 [POST_COUNT] 篇文章，[PAGE_COUNT] 頁。"
 
 LICENSE_ANNOUNCE:
   en:      "This work is licensed under a [LICENSE] license."

data/_includes/blog/article-data.html

@@ -26,7 +26,7 @@
         {%- assign __path = all_path | append: '?tag=' -%}
         {%- include snippets/prepend-baseurl.html -%}
         <li>
-          <a class="round-rect-button" href="{{ __return | append: _tag | replace: '//', '/' }}">{{ tag }}</a>
+          <a class="pill-button" href="{{ __return | append: _tag | replace: '//', '/' }}">{{ tag }}</a>
         </li>
       {%- endfor -%}
     </ul>

data/_includes/blog/header.html

@@ -4,13 +4,7 @@
   {%- else -%}
     {%- assign __path = '/' -%}
   {%- endif -%}
-  {%- assign pre7 = __path | slice: 0, 7 -%} {%- assign pre8 = __path | slice: 0, 8 -%}
-  {%- if pre7 == 'http://' or pre8 == 'https://' -%}
-    {%- assign href = __path -%}
-  {%- else -%}
-    {%- include snippets/prepend-baseurl.html -%}
-    {%- assign href = __return -%}
-  {%- endif -%}
+  {%- include snippets/get-nav-url.html -%}
   {%- if site.title -%}
     <a class="site-title" title="{%- if site.description -%}{{ site.description }}{%- endif -%}" href="{{ __return }}">{{ site.title }}</a>
   {%- endif -%}
@@ -24,13 +18,8 @@
       {%- else -%}
         {%- assign __path = '/' -%}
       {%- endif -%}
-      {%- assign pre7 = __path | slice: 0, 7 -%} {%- assign pre8 = __path | slice: 0, 8 -%}
-      {%- if pre7 == 'http://' or pre8 == 'https://' -%}
-        {%- assign href = __path -%}
-      {%- else -%}
-        {%- include snippets/prepend-baseurl.html -%}
-        {%- assign href = __return -%}
-      {%- endif -%}
+      {%- include snippets/get-nav-url.html -%}
+      {%- assign href = __return -%}
       {%- assign __locale = site.data.locale.NAV.HOME -%}
       {%- include snippets/locale-to-string.html -%}
       <li><a href="{{ href }}">{{ __return }}</a></li>
@@ -39,14 +28,14 @@
       {%- else -%}
         {%- assign __path = '/all.html' -%}
       {%- endif -%}
-      {%- include snippets/prepend-baseurl.html -%}
+      {%- include snippets/get-nav-url.html -%}
       {%- assign href = __return -%}
       {%- assign __locale = site.data.locale.NAV.ALL -%}
       {%- include snippets/locale-to-string.html -%}
       <li><a href="{{ href }}">{{ __return }}</a></li>
       {%- for list in site.nav_lists -%}
         {%- assign __path = list.url -%}
-        {%- include snippets/prepend-baseurl.html -%}
+        {%- include snippets/get-nav-url.html -%}
         {%- assign href = __return -%}
         {%- assign __locale = list.titles -%}
         {%- include snippets/locale-to-string.html -%}
@@ -57,7 +46,7 @@
       {%- else -%}
         {%- assign __path = '/feed.xml' -%}
       {%- endif -%}
-      {%- include snippets/prepend-baseurl.html -%}
+      {%- include snippets/get-nav-url.html -%}
       {%- assign href = __return -%}
       {%- assign __locale = site.data.locale.NAV.RSS -%}
       {%- include snippets/locale-to-string.html -%}

data/_includes/blog/tags.html

@@ -18,7 +18,7 @@
 <div class="m-tags">
   <ul class="inline-list">
     <li>
-      <button type="button" class="js-article-tag js-tag-show-all all round-rect-button" onclick="tagSelect('')">Show All
+      <button type="button" class="js-article-tag js-tag-show-all all pill-button" onclick="tagSelect('')">Show All
         <div class="tag-count">{{ site.posts | size }}</div>
       </button>
     </li>
@@ -43,7 +43,7 @@
       {%- else -%}
         {%- assign c_index = 4 -%}
       {%- endif -%}
-      <li><button type="button" class="js-article-tag tag-{{ c_index }} round-rect-button"
+      <li><button type="button" class="js-article-tag tag-{{ c_index }} pill-button"
         data-tag="{{ tag[0] | strip | url_encode }}" onclick="tagSelect('{{ tag[0] | strip | url_encode }}')">
           <span>{{ tag[0] | strip }}</span><div class="tag-count">{{ tag[1].size }}</div>
         </button>

data/_includes/info/follow-me.html

@@ -6,7 +6,7 @@
     <link itemprop="url" href="{{ '/' | prepend: site.url }}">
     {%- if site.author.weibo -%}
       <li title="{{ __return | replace: '[NAME]', 'Weibo' }}">
-        <div class="round-button weibo">
+        <div class="floating-action-round-button weibo">
           <a itemprop="sameAs" href="https://weibo.com/{{ site.author.weibo }}" target="_blank">
             <div class="icon">{%- include icon/social/weibo.svg -%}</div>
           </a>
@@ -15,7 +15,7 @@
     {%- endif -%}
     {%- if site.author.facebook -%}
       <li title="{{ __return | replace: '[NAME]', 'Facebook' }}">
-        <div class="round-button facebook">
+        <div class="floating-action-round-button facebook">
           <a itemprop="sameAs" href="https://www.facebook.com/{{ site.author.facebook }}" target="_blank">
             <div class="icon">{%- include icon/social/facebook.svg -%}</div>
           </a>
@@ -24,7 +24,7 @@
     {%- endif -%}
     {%- if site.author.twitter -%}
       <li title="{{ __return | replace: '[NAME]', 'Twitter' }}">
-        <div class="round-button twitter">
+        <div class="floating-action-round-button twitter">
           <a itemprop="sameAs" href="https://twitter.com/{{ site.author.twitter }}" target="_blank">
             <div class="icon">{%- include icon/social/twitter.svg -%}</div>
           </a>
@@ -33,7 +33,7 @@
     {%- endif -%}
     {%- if site.author.googleplus -%}
       <li title="{{ __return | replace: '[NAME]', 'Google+' }}">
-        <div class="round-button googlepluse">
+        <div class="floating-action-round-button googlepluse">
           <a itemprop="sameAs" href="https://plus.google.com/u/0/{{ site.author.googleplus }}" target="_blank">
             <div class="icon">{%- include icon/social/googleplus.svg -%}</div>
           </a>
@@ -42,7 +42,7 @@
     {%- endif -%}
     {%- if site.author.github -%}
       <li title="{{ __return | replace: '[NAME]', 'Github' }}">
-        <div class="round-button github">
+        <div class="floating-action-round-button github">
           <a itemprop="sameAs" href="https://github.com/{{ site.author.github }}" target="_blank">
             <div class="icon">{%- include icon/social/github.svg -%}</div>
           </a>
@@ -51,7 +51,7 @@
     {%- endif -%}
     {%- if site.author.linkedin -%}
       <li title="{{ __return | replace: '[NAME]', 'Linkedin' }}">
-        <div class="round-button linkedin">
+        <div class="floating-action-round-button linkedin">
           <a itemprop="sameAs" href="https://www.linkedin.com/in/{{ site.author.linkedin }}" target="_blank">
             <div class="icon">{%- include icon/social/linkedin.svg -%}</div>
           </a>
@@ -60,7 +60,7 @@
     {%- endif -%}
     {%- if site.author.douban -%}
       <li title="{{ __return | replace: '[NAME]', 'Douban' }}">
-        <div class="round-button douban">
+        <div class="floating-action-round-button douban">
           <a itemprop="sameAs" href="https://www.douban.com/people/{{ site.author.douban }}" target="_blank">
             <div class="icon">{%- include icon/social/douban.svg -%}</div>
           </a>

data/_includes/snippets/get-nav-url.html

@@ -0,0 +1,7 @@
+{%- assign pre7 = __path | slice: 0, 7 -%} {%- assign pre8 = __path | slice: 0, 8 -%}
+{%- if pre7 == 'http://' or pre8 == 'https://' -%}
+  {%- assign __return = __path -%}
+{%- else -%}
+  {%- include snippets/prepend-baseurl.html -%}
+  {%- assign __return = __return -%}
+{%- endif -%}

data/_includes/utils/comment-gitalk.html

@@ -0,0 +1,22 @@
+{%- if site.disqus.shortname == nil and site.gitalk.clientID and site.gitalk.clientSecret and site.gitalk.repository and site.gitalk.owner and site.gitalk.admin and page.key -%}
+	<link rel="stylesheet" href="//unpkg.com/gitalk/dist/gitalk.css">
+	<div id="js-gitalk-container"></div>
+  {%- assign admin = '' -%}
+  {%- for adminId in site.gitalk.admin -%}
+    {%- assign admin = admin | append: ", '" | append: adminId | append: "'" -%}
+  {%- endfor -%}
+  {%- assign last = admin | size | minus: 1 -%}
+  {%- assign admin = admin | slice: 2, last -%}
+	<script src="//unpkg.com/gitalk/dist/gitalk.min.js"></script>
+	<script>
+		var gitalk = new Gitalk({
+			clientID: '{{ site.gitalk.clientID }}',
+			clientSecret: '{{ site.gitalk.clientSecret }}',
+			repo: '{{ site.gitalk.repository }}',
+			owner: '{{ site.gitalk.owner }}',
+			admin: [{{ admin }}],
+      id: '{{ page.key }}'
+		});
+		gitalk.render('js-gitalk-container');
+	</script>
+{%- endif -%}

data/_includes/utils/google-analytics.html

@@ -4,10 +4,10 @@
     (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','//www.google-analytics.com/analytics.js','ga');
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
     ga('create', '{{ site.ga_tracking_id }}', 'auto');
     ga('send', 'pageview');
 </script>
 <!-- End Google Analytics -->
-{%- endif -%}
+{%- endif -%}

data/_includes/utils/mathjax.html

@@ -1,5 +1,8 @@
 {%- if site.mathjax == true or page.mathjax == true -%}
-<script type="text/javascript" async
-    src="https://cdn.bootcss.com/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML">
+<script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+        tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
 </script>
+<script type="text/javascript" async src="//cdn.bootcss.com/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 {%- endif -%}

data/_includes/utils/mermaid.html

@@ -0,0 +1,9 @@
+{%- if site.mermaid == true or page.mermaid == true -%}
+<script src="//cdn.bootcss.com/mermaid/7.1.2/mermaid.min.js"></script>
+<script>
+  mermaid.init(undefined, '.language-mermaid');
+  $(function() {
+      mermaid.initialize({ startOnLoad: true });
+  });
+</script>
+{%- endif -%}

data/_layouts/blog-base.html

@@ -15,7 +15,6 @@
     {%- endif -%}
     </style>
     <script src="//cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
-    {%- include utils/mathjax.html -%}
   </head>
   <body>
     <div class="m-page-stage js-page-stage">{{ content }}</div>
@@ -28,7 +27,9 @@
         });
       });
     </script>
-    {%- if ga_tracking_id and site.isdebug == false -%}
+    {%- include utils/mathjax.html -%}
+    {%- include utils/mermaid.html -%}
+    {%- if site.isdebug == false -%}
       {%- include utils/google-analytics.html -%}
     {%- endif -%}
   </body>

data/_layouts/home.html

@@ -57,12 +57,12 @@ titles:
                 <div class="round-button cur"><span>{{ page }}</span></div>
               </li>
             {%- elsif page == 1 -%}
-            {%- if site.paths.home -%}
-              {%- assign __path = site.paths.home -%}
-            {%- else -%}
-              {%- assign __path = '/' -%}
-            {%- endif -%}
-            {%- include snippets/prepend-baseurl.html -%}
+              {%- if site.paths.base -%}
+                {%- assign __path = site.paths.base -%}
+              {%- else -%}
+                {%- assign __path = '/' -%}
+              {%- endif -%}
+              {%- include snippets/prepend-baseurl.html -%}
               {%- assign href = __return -%}
               <li>
                 <a class="round-button" href="{{ href }}"><span>{{ page }}</span></a>
@@ -96,7 +96,7 @@ titles:
   </div>
 </div>
 {%- if site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class and site.isdebug == false -%}
-  <script src="https://cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
+  <script src="//cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
   <script>
     $(function() {
       AV.init({

data/_layouts/page.html

@@ -8,6 +8,7 @@ layout: blog-default
     <div class="m-article-content" itemprop="articleBody">{{ content }}</div>
     {%- if page.comment != false -%}
       <section>{%- include utils/comment-disqus.html -%}</section>
+      <section>{%- include utils/comment-gitalk.html -%}</section>
     {%- endif -%}
   </article>
 </div>

data/_layouts/post.html

@@ -30,7 +30,8 @@ layout: blog-default
 					</div>
 				</footer>
 				{%- if page.comment != false -%}
-						<section>{%- include utils/comment-disqus.html -%}</section>
+					<section>{%- include utils/comment-disqus.html -%}</section>
+					<section>{%- include utils/comment-gitalk.html -%}</section>
 				{%- endif -%}
 			</article>
 		</div>
@@ -147,7 +148,7 @@ layout: blog-default
 	});
 </script>
 {%- if page.key and site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class and site.isdebug == false -%}
-  <script src="https://cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
+  <script src="//cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
   <script type="text/javascript">
 		$(function() {
 			// 初始化
@@ -179,8 +180,9 @@ layout: blog-default
 
 				function addOne(page) {
 					page.increment('views', 1);
-					page.fetchWhenSave(true);
-					page.save().then(function(page) {
+					page.save(null, {
+						fetchWhenSave: true
+					}).then(function(page) {
 						$("#post-key-{{ page.key }}").text(page.attributes.views);
 					}, function(error) {
 						if (error) {

data/_sass/base/_links.scss

@@ -23,17 +23,11 @@ a {
   @include transition(all .8s ease 0s);
 }
 
-.round-button {
+%button {
   font-weight: $bold-font-weight;
   line-height: 1;
-  @include flexbox;
-  @include justify-content(center);
-  @include align-items(center);
-  box-sizing: border-box;
-  width: $base-font-size * 2;
-  height: $base-font-size * 2;
   text-decoration: none;
-  border-radius: 50%;
+  box-sizing: border-box;
   @extend %cursor-pointer;
   @include link-colors( $text-color-3, $main-color-3, $text-color-1, $main-color-1);
   @include link-normal {
@@ -46,32 +40,34 @@ a {
   svg {
     width: $base-font-size;
     height: $base-font-size;
+    path {
+      @include transition(fill .8s ease 0s);
+    }
   }
-  &.inactive {
-    @extend %cursor-not-allowed;
-    @include link-colors( rgba($text-color-3, .5), $main-color-3, rgba($text-color-3, .5), $main-color-3);
+}
+
+%floating-action {
+  box-shadow: $shadow-base;
+  &:hover {
+    box-shadow: $shadow-high;
   }
 }
 
-.round-rect-button {
-  font-weight: $bold-font-weight;
-  line-height: 1;
+.round-button {
+  @extend %button;
+  @include round;
+  @include flexbox;
+  @include justify-content(center);
+  @include align-items(center);
+}
+
+.floating-action-round-button {
+  @extend .round-button;
+  @extend %floating-action;
+}
+
+.pill-button {
+  @extend %button;
+  @include round-rect($base-font-size * 2);
   display: block;
-  box-sizing: border-box;
-  padding: $base-font-size * .4 $base-font-size * .6;
-  text-decoration: none;
-  border-radius: $base-font-size * 2;
-  @extend %cursor-pointer;
-  @include link-colors( $text-color-3, $main-color-3, $text-color-1, $main-color-1);
-  @include link-normal {
-    text-decoration: none;
-  }
-  @include link-emphasize {
-    text-decoration: none;
-  }
-  @include transition(all .8s ease 0s);
-  svg {
-    width: $base-font-size;
-    height: $base-font-size;
-  }
 }

data/_sass/blog/_layout.post.scss

@@ -24,7 +24,8 @@
       box-sizing: border-box;
       width: $aside-width;
       position: absolute;
-      padding: $spacing-unit 0 $spacing-unit $spacing-unit * 2;
+      padding: $spacing-unit;
+      padding-right: 0;
       overflow: hidden;
     }
   }

data/_sass/colors/_colors.chocolate.scss

@@ -26,7 +26,7 @@ $text-background-color:#e3d1ca;
 $border-color:     #dcc6bd;
 $select-color:     rgba($main-color-3, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-down:      0 2px 10px rgba(#000, .15), 0 0 16px rgba(#000, .05);
+$shadow-color:     rgba(#000, .15);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/_colors.dark.scss

@@ -25,7 +25,7 @@ $text-background-color:#1e242d;
 $border-color:     #161b21;
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#fff, .1);
-$shadow-down:      none;
+$shadow-color:     rgba(#000, .1);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/_colors.default.scss

@@ -26,7 +26,7 @@ $text-background-color:#f2f2f2;
 $border-color:     #aeaeae;
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-down:      0 2px 10px rgba(#000, .15), 0 0 16px rgba(#000, .05);
+$shadow-color:     rgba(#000, .15);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/_colors.forest.scss

@@ -26,7 +26,7 @@ $text-background-color:#f2f2f2;
 $border-color:     #eacfd3;
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#bb6170, .15);
-$shadow-down:      0 2px 10px rgba(#000, .15), 0 0 16px rgba(#000, .05);
+$shadow-color:     rgba(#000, .15);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/_colors.ocean.scss

@@ -26,7 +26,7 @@ $text-background-color:#f2f2f2;
 $border-color:     #aeaeae;
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-down:      0 2px 10px rgba(#000, .15), 0 0 16px rgba(#000, .05);
+$shadow-color:     rgba(#000, .15);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/_colors.orange.scss

@@ -26,7 +26,7 @@ $text-background-color:rgba(#000, .05);
 $border-color:     rgba(#000, .2);
 $select-color:     rgba($main-color-3, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-down:      0 2px 10px rgba(#000, .15), 0 0 16px rgba(#000, .05);
+$shadow-color:     rgba(#000, .15);
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/components/_article.content.scss

@@ -1,4 +1,5 @@
 .m-article-content {
+  word-wrap: break-word;
   line-height: $article-line-height;
   h1,
   h2,
@@ -44,40 +45,39 @@
     height: $base-font-size * $article-line-height * .7;
   }
   code {
-    padding: $code-font-size * .2 $code-font-size * .5;
-    border-radius: $code-font-size * .4;
-    background-color: $text-background-color;
+    @include round-rect($round-rect-radius, $base-font-size * .2 $base-font-size * .5);
     span {
       padding: 0;
       margin: 0;
     }
   }
+  div.highlighter-rouge, figure, pre {
+    margin: $content-gap 0;
+  }
+  code.language-mermaid {
+    background-color: $background-color;
+  }
   pre {
     display: block;
     overflow: auto;
     -webkit-overflow-scrolling: touch;
-    margin: $content-gap 0;
-    border-radius: $code-font-size * .4;
-    ;
-    background-size: auto $code-font-size * $code-line-height * 2;
-    background-origin: content-box;
+    border-radius: $round-rect-radius;
     &>code {
+      padding-top: $code-font-size * 1.5;
+      padding-bottom: $code-font-size * 1.3;
       font-size: $code-font-size;
-      padding: $code-font-size;
+      word-wrap: normal;
       margin: 0;
       display: block;
       line-height: $code-line-height;
-      background-color: transparent;
     }
   }
   figure {
-    margin: $content-gap 0;
     &:before {
       content: attr(data-lang);
-      background-color: $text-background-color;
       display: block;
-      border-top-left-radius: $code-font-size / 2;
-      border-top-right-radius: $code-font-size / 2;
+      border-top-left-radius: $round-rect-radius;
+      border-top-right-radius: $round-rect-radius;
       padding: $code-font-size / 2 $code-font-size $code-font-size / 2 0;
       color: $decorate-color;
       font-weight: $bold-font-weight;
@@ -86,9 +86,9 @@
       text-transform: uppercase;
     }
     &>pre {
+      margin: 0;
       border-top-left-radius: 0;
       border-top-right-radius: 0;
-      margin: 0;
       &>code {
         padding-top: 0;
       }

data/_sass/components/_follow-me.scss

@@ -2,6 +2,7 @@
   text-align: center;
   &>ul {
     margin: 0;
+    justify-content: center;
   }
   .round-button {
     color: $text-color-1;
@@ -11,30 +12,30 @@
     &:not(:last-child) {
       margin-right: $spacing-unit / 6;
     }
-    @include link-background-colors ( $main-color-1, darken($main-color-1, 20%))
+    @include link-background-colors ( $main-color-1, lighten($main-color-1, 5%))
   }
   .mail {
-    @include link-background-colors ( $mail-color, darken($mail-color, 20%))
+    @include link-background-colors ( $mail-color, lighten($mail-color, 5%))
   }
   .weibo {
-    @include link-background-colors ( $weibo-color, darken($weibo-color, 20%))
+    @include link-background-colors ( $weibo-color, lighten($weibo-color, 5%))
   }
   .facebook {
-    @include link-background-colors ( $facebook-color, darken($facebook-color, 20%))
+    @include link-background-colors ( $facebook-color, lighten($facebook-color, 5%))
   }
   .twitter {
-    @include link-background-colors ( $twitter-color, darken($twitter-color, 20%))
+    @include link-background-colors ( $twitter-color, lighten($twitter-color, 5%))
   }
   .googlepluse {
-    @include link-background-colors ( $google-plus-color, darken($google-plus-color, 20%))
+    @include link-background-colors ( $google-plus-color, lighten($google-plus-color, 5%))
   }
   .github {
-    @include link-background-colors ( $github-color, lighten($github-color, 30%))
+    @include link-background-colors ( $github-color, lighten($github-color, 20%))
   }
   .linkedin {
-    @include link-background-colors ( $linkedin-color, darken($linkedin-color, 20%))
+    @include link-background-colors ( $linkedin-color, lighten($linkedin-color, 5%))
   }
   .douban {
-    @include link-background-colors ( $douban-color, darken($douban-color, 20%))
+    @include link-background-colors ( $douban-color, lighten($douban-color, 5%))
   }
 }

data/_sass/components/_footer.scss

@@ -14,11 +14,6 @@
   a {
     @include link-text-colors ( $text-color-3, $main-color-1);
   }
-  .follow-me {
-    .round-button {
-      box-shadow: $shadow-down;
-    }
-  }
   .site-info {
     text-align: center;
     font-size: $tiny-font-size;

data/_sass/components/_license.scss

@@ -1,8 +1,7 @@
 .m-license {
-  border-radius: $spacing-unit / 2;
+  @include round-rect($base-font-size, $base-font-size / 2 $base-font-size);
   background-color: $text-background-color;
-  box-shadow: $shadow-down;
-  padding: $base-font-size / 2 $base-font-size;
+  box-shadow: $shadow-base;
   font-weight: $bold-font-weight;
   img {
     vertical-align: bottom;

data/_sass/components/_toc.scss

@@ -2,33 +2,23 @@
   ul {
     display: block;
     list-style-type: none;
-    &>li {
-      border: 0 solid rgba(0, 0, 0, 0);
-      border-left-width: 4px;
-      margin-left: -4px;
-      &:not(:last-child) {
-        margin-bottom: $content-gap / 4;
-      }
-    }
   }
   a {
-    display: block;
-    margin: $small-font-size / 4;
+    display: inline-block;
     font-size: $small-font-size;
     text-decoration: none;
     line-height: $toc-line-height;
     font-weight: $base-font-weight;
-    @include link-normal {
-      color: $text-color;
-    }
+    @include round-rect($round-rect-radius, $base-font-size / 5 $base-font-size);
     @include link-emphasize-no-focus {
-      color: $main-color-1;
+      background-color: $text-background-color;
     }
   }
   .toc-h1,
   .toc-h2 {
     padding: 0;
     a {
+      color: $text-color-d;
       font-weight: $bold-font-weight;
     }
   }
@@ -37,29 +27,32 @@
   .toc-h5,
   .toc-h6 {
     a {
+      color: $text-color;
       font-size: $tiny-font-size;
     }
   }
   .toc-h1,
   .toc-h2 {
-    margin-top: $small-font-size / 2;
+    margin-top: $base-font-size * .6;
   }
   .toc-h3 {
-    padding-left: $small-font-size;
+    padding-left: $base-font-size * 1.5;
   }
   .toc-h4 {
-    padding-left: $small-font-size * 2;
+    padding-left: $base-font-size * 3;
   }
   .toc-h5 {
-    padding-left: $small-font-size * 3;
+    color: $text-color-l;
+    padding-left: $base-font-size * 3;
   }
   .toc-h6 {
-    padding-left: $small-font-size * 3;
+    color: $text-color-l;
+    font-size: $tiny-font-size;
+    padding-left: $base-font-size * 3;
   }
   .toc-active {
-    border-color: $main-color-1;
-    @include transition(border-color ease .8s);
     a {
+      background-color: $text-background-color;
       color: $main-color-1;
     }
   }

data/_sass/components/_wrapper.scss

@@ -16,10 +16,10 @@
 }
 
 .inline-list {
+  display: flex;
+  flex-wrap: wrap;
   &>li {
-    display: inline-block;
     list-style-type: none;
-    vertical-align: bottom;
     margin-top: $content-gap / 6;
     margin-bottom: $content-gap / 6;
     &:not(:last-child) {

data/_sass/mixins/_link.scss

@@ -29,21 +29,15 @@
   @include link-normal {
     color: $nc;
     background-color: $nbc;
+    svg path {
+      fill: $nc;
+    }
   }
   @include link-emphasize {
     color: $ec;
     background-color: $ebc;
-  }
-  svg {
-    @include link-normal {
-      path {
-        fill: $nc;
-      }
-    }
-    @include link-emphasize {
-      path {
-        fill: $ec;
-      }
+    svg path {
+      fill: $ec;
     }
   }
 }
@@ -51,9 +45,15 @@
 @mixin link-text-colors($nc, $ec) {
   @include link-normal {
     color: $nc;
+    svg path {
+      fill: $nc;
+    }
   }
   @include link-emphasize {
     color: $ec;
+    svg path {
+      fill: $ec;
+    }
   }
 }
 

data/_sass/mixins/_shape.scss

@@ -0,0 +1,19 @@
+$round-length: $base-font-size * 2;
+$round-rect-radius: $base-font-size * .4;
+$round-rect-padding: $base-font-size * .4 $base-font-size * .6;
+
+@mixin round(
+  $length: $round-length
+) {
+  width: $length;
+  height: $length;
+  border-radius: 50%;
+}
+
+@mixin round-rect(
+  $radius: $round-rect-radius,
+  $padding: $round-rect-padding
+) {
+  padding: $padding;
+  border-radius: $radius;
+}

data/_sass/settings/_base.scss

@@ -1,11 +1,11 @@
 // Our variables
-$spacing-unit:     30px;
-$content-gap:		0.8em;
+$spacing-unit:      30px;
+$content-gap:		    0.8em;
 
 // Width of the content area
-$content-max-width:    800px;
-$aside-width: 240px;
-$footer-height: 12em;
+$content-max-width: 800px;
+$aside-width:       240px;
+$footer-height:     12em;
 
 // Device Width
 $on-palm:          500px;

data/_sass/settings/_colors.scss

@@ -3,4 +3,7 @@
 // @import './colors/_colors.forest.scss';
 // @import './colors/_colors.ocean.scss';
 // @import './colors/_colors.chocolate.scss';
-// @import './colors/_colors.orange.scss';
+// @import './colors/_colors.orange.scss';
+
+$shadow-base: 0 2px 10px $shadow-color, 0 0 16px rgba($shadow-color, opacity($shadow-color) * 0.6);
+$shadow-high: 0 4px 10px rgba($shadow-color, opacity($shadow-color) / 3 + 0.3), 0 0 16px $shadow-color;

data/_sass/settings/_highlighting.scss

@@ -1,9 +1,15 @@
 /**
  * Syntax highlighting styles
  */
-pre {
-  background-color: $text-background-color;
-  code {
+.m-article-content {
+  figure:before {
+    background-color: $text-background-color;
+  }
+  code, pre {
+    background-color: $text-background-color;
+  }
+  pre>code {
+    background-color: transparent;
     color: $text-color;
   }
 }

data/assets/css/blog.scss

@@ -13,6 +13,7 @@
     "mixins/media",
     "mixins/link",
     "mixins/flex",
+    "mixins/shape",
 
     "base/base",
     "base/text",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-text-theme
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - kitian616
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -145,13 +145,16 @@ files:
 - _includes/info/follow-me.html
 - _includes/logo/logo.svg
 - _includes/snippets/get-lang.html
+- _includes/snippets/get-nav-url.html
 - _includes/snippets/locale-to-string.html
 - _includes/snippets/page-title.html
 - _includes/snippets/page-url.html
 - _includes/snippets/prepend-baseurl.html
 - _includes/utils/comment-disqus.html
+- _includes/utils/comment-gitalk.html
 - _includes/utils/google-analytics.html
 - _includes/utils/mathjax.html
+- _includes/utils/mermaid.html
 - _layouts/all.html
 - _layouts/blog-base.html
 - _layouts/blog-default.html
@@ -191,6 +194,7 @@ files:
 - _sass/mixins/_link.scss
 - _sass/mixins/_media.scss
 - _sass/mixins/_prefix.scss
+- _sass/mixins/_shape.scss
 - _sass/settings/_base.scss
 - _sass/settings/_colors.scss
 - _sass/settings/_font.scss