updated to latest 3-jekyll theme

alsodzy · Feb 28, 2016 · c30b478 · c30b478
1 parent fd25abc
commit c30b478
Show file tree

Hide file tree

Showing 56 changed files with 1,941 additions and 2,995 deletions.
diff --git a/404.html b/404.html
@@ -1,8 +1,7 @@
----
-layout: base
-title: 404 Not Found Error
----
-
-<article id="post__content">
-  <h1 id="post__title">404 Not Found Error</h1>
-</article> <!-- end #post__content -->
+---
+layout: default
+---
+<div id="not-found" class="container">
+  <h1>抱歉，文章不存在</h1>
+  <p>欢迎阅读其他文章</p>
+</div>
diff --git a/_config.yml b/_config.yml
@@ -1,33 +1,39 @@
-permalink: /:year/:month/:day/:title.html
-markdown: kramdown
-highlighter: rouge
-
-kramdown:
-  input: GFM
+# Site settings
+title: 闫肃的个人博客
+email: [email protected]
+description: > # this means to ignore newlines until "baseurl:"
+  闫肃的博客
+baseurl: "" # the subpath of your site, e.g. /blog/
+url: "http://yansu.org" # the base hostname & protocol for your site
+rss_url: /pages/feed.xml
 
-# 作者信息
-author: 
-  name: 闫肃
-  email: [email protected]
-  link: http://yansu.org
-  weibo: http://weibo.com/yansu0711
-  github: http://github.com/suyan
+# Sidebar filter
+# Choose 'tag' or 'category' as filter in sidebar.
+filter: 'category'
 
-# 站点信息
-title: 闫肃的博客 
-description: 闫肃的博客
-url: http://yansu.org
-rss_url: /pages/atom.xml
+# Social account
+twitter: masonsuyan
+# weibo:    ID
+github: suyan
+# codepen:  username
+# dribbble: username
 
 # avatar头像及Favicon
 avatar: http://7u2ho6.com1.z0.glb.clouddn.com/site-avatar.png
 favicon: http://7u2ho6.com1.z0.glb.clouddn.com/site-favicon.ico
 
+# disqus 设置
+disqus:
+  shortname: suyan-zh
+
 # google analytics 设置
 ga:
   id: UA-54767140-1
   url: yansu.org
 
-# disqus 设置
-disqus:
-  shortname: suyan-zh
+# Build settings
+permalink: /:year/:month/:day/:title.html
+markdown: kramdown
+highlighter: rouge
+sass:
+  style: compressed
diff --git a/_includes/copyright.html b/_includes/copyright.html
diff --git a/_includes/disqus.html b/_includes/disqus.html
diff --git a/_includes/footer.html b/_includes/footer.html
diff --git a/_includes/head.html b/_includes/head.html
@@ -0,0 +1,22 @@
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+  <!--[if lte IE 9]><meta http-equiv="refresh" content="0;url={{ "/ie.html" | prepend: site.baseurl }}"><![endif]-->
+
+  <meta name="author" content="{{ site.author.name }}">
+  {% if page.keywords %}
+    <meta name="keywords" content="{{ page.keywords }}">
+  {% endif %}
+
+  <title>{% if page.title %}{{ page.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 %}">
+
+  <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
+  <link rel="shortcut icon" href="{{ site.favicon }}" />
+  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.rss_url | prepend: site.baseurl | prepend: site.url }}" />
+
+  <script src="{{ "/assets/js/prefixfree.js" | prepend: site.baseurl }}"></script>
+</head>
diff --git a/_includes/header.html b/_includes/header.html
diff --git a/_includes/nav.html b/_includes/nav.html
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -0,0 +1,16 @@
+<script src="{{ "/assets/js/jquery-2.1.3.min.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/js/jquery.pjax.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/js/nprogress.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/js/main.js" | prepend: site.baseurl }}"></script>
+
+{% if site.google_analytics %}
+<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','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
+</script>
+{% endif %}
diff --git a/_includes/share.html b/_includes/share.html
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -0,0 +1,48 @@
+<aside id="sidebar">
+  <div id="sidebar-left">
+    <a id="sidebar-avatar" href="{{ "/" | prepend: site.baseurl }}">
+      <img id="sidebar-avatar-img" alt="{{ site.tittle }}" src="{{ site.avatar | prepend: site.baseurl }}"/>
+    </a>
+
+    <div id="sidebar-social">
+      <a href="{{ site.rss_url | prepend: site.baseurl }}" class="sidebar-social-icon feed"></a>
+      <a href="mailto:{{ site.email }}" class="sidebar-social-icon email"></a>
+      {% include social.html %}
+    </div>
+
+    <ul id="sidebar-tags">
+      <li class="sidebar-tag active" data-filter="all">全部文章</li>
+      {% if site.filter == 'category' %}
+        {% for category in site.categories %}
+          <li class="sidebar-tag" data-filter="{{ category | first }}">{{ category | first }}</li>
+        {% endfor %}
+      {% elsif site.filter == 'tag' %}
+        {% for tag in site.tags %}
+          <li class="sidebar-tag" data-filter="{{ tag | first }}">{{ tag | first }}</li>
+        {% endfor %}
+      {% endif %}
+    </ul>
+  </div>
+
+  <div id="sidebar-right">
+    <div id="search-box">
+      <input id="search-input" type="text" placeholder="Search" />
+    </div>
+
+    <nav id="toc">
+      {% if site.filter == 'category' %}
+        {% for post in site.posts %}
+          <a class="toc-link" data-tags="{{ post.categories | join: ' ' }}" href="{{ post.url }}">
+            {{ post.title }}
+          </a>
+        {% endfor %}
+      {% elsif site.filter == 'tag' %}
+        {% for post in site.posts %}
+          <a class="toc-link" data-tags="{{ post.tags | join: ' ' }}" href="{{ post.url }}">
+            {{ post.title }}
+          </a>
+        {% endfor %}
+      {% endif %}
+    </nav>
+  </div>
+</aside>
diff --git a/_includes/social.html b/_includes/social.html
@@ -0,0 +1,19 @@
+{% if site.twitter %}
+  <a href="https://twitter.com/{{ site.twitter }}" class="sidebar-social-icon twitter" target="_blank"></a>
+{% endif %}
+
+{% if site.weibo %}
+  <a href="http://www.weibo.com/{{ site.weibo }}" class="sidebar-social-icon weibo" target="_blank"></a>
+{% endif %}
+
+{% if site.github %}
+  <a href="https://github.com/{{ site.github }}" class="sidebar-social-icon github" target="_blank"></a>
+{% endif %}
+
+{% if site.codepen %}
+  <a href="http://codepen.io/{{ site.codepen }}" class="sidebar-social-icon codepen" target="_blank"></a>
+{% endif %}
+
+{% if site.dribbble %}
+  <a href="https://dribbble.com/{{ site.dribbble }}" class="sidebar-social-icon dribbble" target="_blank"></a>
+{% endif %}
diff --git a/_layouts/base.html b/_layouts/base.html
diff --git a/_layouts/compress.html b/_layouts/compress.html
@@ -0,0 +1,11 @@
+---
+#
+# Jekyll layout that compresses HTML
+# v1.1.1
+# http://jch.penibelst.de/
+# © 2015 Anatol Broder
+# MIT License
+#
+---
+
+{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if site.compress_html.comments.size == 2 %}{% assign _comment_befores = _content | split: site.compress_html.comments.first %}{% for _comment_before in _comment_befores %}{% assign _comment_content = _comment_before | split: site.compress_html.comments.last | first %}{% if _comment_content %}{% capture _comment %}{{ site.compress_html.comments.first }}{{ _comment_content }}{{ site.compress_html.comments.last }}{% endcapture %}{% assign _content = _content | remove: _comment %}{% endif %}{% endfor %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% case _pres.size %}{% when 2 %}{% capture _content %}{{ _content }}<pre{{ _pres.first }}</pre>{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% when 1 %}{% capture _content %}{{ _content }}{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% endcase %}{% endfor %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{{ _content }}{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -0,0 +1,28 @@
+---
+layout: compress
+---
+<!DOCTYPE html>
+<html>
+  {% include head.html %}
+  <body>
+    {% include sidebar.html %}
+
+    <main id="main">
+      {{ content }}
+
+      <div class="footer">
+        <div class="container">
+          <p class="footer-entry">All content is licensed under <a href="http://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank">CC BY-NC-SA</a></p>
+          <p class="footer-entry">Buit with <a href="http://jekyllrb.com/" target="_blank">Jekyll</a> and <a href="https://github.com/P233/3-Jekyll" target="_blank">3-Jekyll theme</a> • Hosted on <a href="https://pages.github.com/" target="_blank">Github</a></p>
+        </div>
+      </div>
+    </main>
+
+    <button id="menu">
+      <span id="menu-icons"></span>
+    </button>
+
+    {% include scripts.html %}
+    {% include googleanalytics.html %}
+  </body>
+</html>
diff --git a/_layouts/page.html b/_layouts/page.html
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,12 +1,30 @@
 ---
-layout: base
+layout: default
 ---
+<article class="post container">
+  <div class="post-meta">
+    <span class="post-meta-span date">{{ page.date | date:"%Y %B %d" }}</span>
+    {% if page.tags.size > 0 %}
+    <span class="post-meta-span tag">{{ page.tags | join: ', ' }}</span>
+    {% endif %}
+  </div>
 
-<article id="post__content">
-  <h1 id="post__title" data-identifier="{{ page.date | date: "%Y%m%d" }}">{{ page.title }}</h1>
+  <h1 class="post-title">{{ page.title }}</h1>
   {{ content }}
-</article> <!-- end #post__content -->
+</article>
 
-{% include share.html %}
-{% include disqus.html %}
+<div class="post-share">
+  <div class="container">
+    <a href="https://twitter.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&text={{ page.title }}" target="_blank" class="post-share-icon twitter"></a>
+    <a href="https://www.evernote.com/clip.action?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&title={{ page.title }}" target="_blank" class="post-share-icon evernote"></a>
+    <a href="http://service.weibo.com/share/share.php?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&title={{ page.title }}" target="_blank" class="post-share-icon weibo"></a>
+  </div>
+</div>
 
+{% if site.disqus.shortname %}
+<div class="comment container">
+  <div id="disqus_thread">
+    <a href=""></a>
+  </div>
+</div>
+{% endif %}
diff --git a/_sass/1-animation.sass b/_sass/1-animation.sass
@@ -0,0 +1,14 @@
+
+@keyframes fadeIn
+  from
+    transform: translateX(35px)
+    opacity: 0
+  to
+    transform: transformX(0)
+    opacity: 1
+
+@keyframes joggle
+  0%, 50%, 100%
+    transform: translateX(0)
+  25%, 75%
+    transform: translateX(3px)