P233 · blackwuxin · Apr 9, 2016 · Apr 9, 2016 · Apr 9, 2016 · Apr 9, 2016
diff --git a/README.md b/README.md
@@ -1,42 +1,3 @@
-# 3-Jekyll Theme
+### 我的博客
 
-新版 3-Jekyll，当前完成度 80%，预览请访问 [http://peiwen.lu](http://peiwen.lu)，[Github repo](https://github.com/P233/P233.github.io)。
-
-旧版请在 [https://github.com/P233/3-Jekyll/releases](https://github.com/P233/3-Jekyll/releases) 下载。
-
-
-## 针对旧版的改进
-
-* 侧边栏使用 Tag 或 Category 做为文章分类，默认 Tag。
-* 自动生成侧边栏分类标签，基本不需要修改模板文件。但标签顺序由 Jekyll 根据时间顺序生成，需要手动调整顺序只能修改 `_includes/sidebar.html`，格式是 `<li class="sidebar-tag" data-filter="TAG">TAG</li>`，替换 `TAG`，大小写敏感。
-* 更加全面的 Sass 变量，方便个性化主题样式。
-* 暂定取消文章的标题目录。
-* 取消了嵌入 Codepen。
-
-
-## TODO
-
-* 搜索功能
-* Webkit 换页动画
-* 改进文章筛选动画
-* <del>集成 Google Analytics</del>
-* 文章时间，Category，Tag 归档页面
-* Favicon
-* Mobile touch swipe
-
-其他建议欢迎[提交 issue](https://github.com/P233/3-Jekyll/issues/new)
-
-
-## 使用
-
-### 设置 `_config.yml`
-
-`_config.yml` 除基本的站点设置外，新加入了社交链接与评论设置。将需要添加的社交帐号填入对应设置，并取消注释，会在头像下方增加一条社交帐号的链接。支持 Twitter, Weibo, Github, Codepen 以及 Dribbble。此外，填入 Disqus 的 shortname 也会启用 Disqus 评论。 `filter` 选项选择使用 `tag` 或 `category` 作为文章分类。
-
-### 修改样式
-
-样式相关的 Sass 变量都存储在 `/css/main.sass` 文件中，修改这个文件可以满足大部分样式定制的需求。建议首先修改 `$gradient-start` 与 `$gradient-end` 两个变量，给自己的博客使用独一无二的侧边栏背景。
-
-### 替换图片
-
-请不要忘记替换 `/assets/img/` 内的图片。`avatar.jpg` 是侧边栏头像的图片，`qrcode.jpg` 会在提示浏览器不兼容时使用。[QR Code 生成器](https://www.unitag.io/qrcode)
+地址：[http://blackwuxin.github.io](http://blackwuxin.github.io)
diff --git a/Xiao.htm b/Xiao.htm
@@ -0,0 +1,220 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+
+		<title> 爱你一万年</title>	  
+
+        <link type="text/css" rel="stylesheet" href="source/default.css">
+		<script type="text/javascript" src="source/jquery.min.js"></script>
+		<script type="text/javascript" src="source/jscex.min.js"></script>
+		<script type="text/javascript" src="source/jscex-parser.js"></script>
+		<script type="text/javascript" src="source/jscex-jit.js"></script>
+		<script type="text/javascript" src="source/jscex-builderbase.min.js"></script>
+		<script type="text/javascript" src="source/jscex-async.min.js"></script>
+		<script type="text/javascript" src="source/jscex-async-powerpack.min.js"></script>
+		<script type="text/javascript" src="source/functions.js" charset="utf-8"></script>
+		<script type="text/javascript" src="source/love.js" charset="utf-8"></script>
+	    <style type="text/css">
+<!--
+.STYLE1 {color: #666666}
+-->
+        </style>
+</head>
+    <body>
+	<audio autoplay="autopaly">
+					<source src="Love-Music.mp3" type="audio/mp3" />
+			</audio>  	 
+        <div id="main">
+
+             <div id="wrap">
+                <div id="text">
+			        <div id="code">
+			      <font color="#FF0000">  	<span class="say">媳妇大人<span><br>
+				  <span class="say">媳妇，知道吗，认识你的这些日子是我这辈子最幸福的时间，情人节快到了，但是我不能陪伴到你身边，所以花了快一天的时间设计了这个卡片送给你，还特意选了一首歌听着很舒服的呢，最后我想对你说：I Love U </span><br>
+						<!--<span class="say"> </span><br>
+<span class="say"> </span><br>
+						<span class="say"> </span><br>
+
+
+
+			        	<span class="say"></span><br>
+<span class="say"></span><br>-->
+
+ <span class="say">我想在这里对你说</span><br>
+						<span class="say"> </span><br>
+                        <span class="say"><span class="space"></span>我真的好想好想你</span><br>
+						<span class="say"><span class="space"></span> 你亲爱的林大人</span>
+			  </font></p>
+      </div>
+                </div>
+                <div id="clock-box">
+                    <span class="STYLE1"></span><font color="#33CC00">截至今天我们已经</font>
+<span class="STYLE1"> 默默走过了</span>
+                  <div id="clock"></div>
+              </div>
+            </div>
+
+        </div>
+
+
+    <script>
+    (function(){
+        var canvas = $('#canvas');
+
+        if (!canvas[0].getContext) {
+            $("#error").show();
+            return false;        }
+
+        var width = canvas.width();
+        var height = canvas.height();        
+        canvas.attr("width", width);
+        canvas.attr("height", height);
+        var opts = {
+            seed: {
+                x: width / 2 - 20,
+                color: "rgb(190, 26, 37)",
+                scale: 2
+            },
+            branch: [
+                [535, 680, 570, 250, 500, 200, 30, 100, [
+                    [540, 500, 455, 417, 340, 400, 13, 100, [
+                        [450, 435, 434, 430, 394, 395, 2, 40]
+                    ]],
+                    [550, 445, 600, 356, 680, 345, 12, 100, [
+                        [578, 400, 648, 409, 661, 426, 3, 80]
+                    ]],
+                    [539, 281, 537, 248, 534, 217, 3, 40],
+                    [546, 397, 413, 247, 328, 244, 9, 80, [
+                        [427, 286, 383, 253, 371, 205, 2, 40],
+                        [498, 345, 435, 315, 395, 330, 4, 60]
+                    ]],
+                    [546, 357, 608, 252, 678, 221, 6, 100, [
+                        [590, 293, 646, 277, 648, 271, 2, 80]
+                    ]]
+                ]] 
+            ],
+            bloom: {
+                num: 700,
+                width: 1080,
+                height: 650,
+            },
+            footer: {
+                width: 1200,
+                height: 5,
+                speed: 10,
+            }
+        }
+
+        var tree = new Tree(canvas[0], width, height, opts);
+        var seed = tree.seed;
+        var foot = tree.footer;
+        var hold = 1;
+
+        canvas.click(function(e) {
+            var offset = canvas.offset(), x, y;
+            x = e.pageX - offset.left;
+            y = e.pageY - offset.top;
+            if (seed.hover(x, y)) {
+                hold = 0; 
+                canvas.unbind("click");
+                canvas.unbind("mousemove");
+                canvas.removeClass('hand');
+            }
+        }).mousemove(function(e){
+            var offset = canvas.offset(), x, y;
+            x = e.pageX - offset.left;
+            y = e.pageY - offset.top;
+            canvas.toggleClass('hand', seed.hover(x, y));
+        });
+
+        var seedAnimate = eval(Jscex.compile("async", function () {
+            seed.draw();
+            while (hold) {
+                $await(Jscex.Async.sleep(10));
+            }
+            while (seed.canScale()) {
+                seed.scale(0.95);
+                $await(Jscex.Async.sleep(10));
+            }
+            while (seed.canMove()) {
+                seed.move(0, 2);
+                foot.draw();
+                $await(Jscex.Async.sleep(10));
+            }
+        }));
+
+        var growAnimate = eval(Jscex.compile("async", function () {
+            do {
+    	        tree.grow();
+                $await(Jscex.Async.sleep(10));
+            } while (tree.canGrow());
+        }));
+
+        var flowAnimate = eval(Jscex.compile("async", function () {
+            do {
+    	        tree.flower(2);
+                $await(Jscex.Async.sleep(10));
+            } while (tree.canFlower());
+        }));
+
+        var moveAnimate = eval(Jscex.compile("async", function () {
+            tree.snapshot("p1", 240, 0, 610, 680);
+            while (tree.move("p1", 500, 0)) {
+                foot.draw();
+                $await(Jscex.Async.sleep(10));
+            }
+            foot.draw();
+            tree.snapshot("p2", 500, 0, 610, 680);
+
+            // 会有闪烁不得意这样做, (＞﹏＜)
+            canvas.parent().css("background", "url(" + tree.toDataURL('image/png') + ")");
+            canvas.css("background", "#ffe");
+            $await(Jscex.Async.sleep(300));
+            canvas.css("background", "none");
+        }));
+
+        var jumpAnimate = eval(Jscex.compile("async", function () {
+            var ctx = tree.ctx;
+            while (true) {
+                tree.ctx.clearRect(0, 0, width, height);
+                tree.jump();
+                foot.draw();
+                $await(Jscex.Async.sleep(25));
+            }
+        }));
+
+        var textAnimate = eval(Jscex.compile("async", function () {
+		    var together = new Date();
+		    together.setFullYear(2015,2,23); 			//时间年月日
+		    together.setHours(23);						//小时	
+		    together.setMinutes(0);					//分钟
+		    together.setSeconds(0);					//秒前一位
+		    together.setMilliseconds(0);				//秒第二位
+
+		    $("#code").show().typewriter();
+            $("#clock-box").fadeIn(500);
+            while (true) {
+                timeElapse(together);
+                $await(Jscex.Async.sleep(1000));
+            }
+        }));
+
+        var runAsync = eval(Jscex.compile("async", function () {
+            $await(seedAnimate());
+            $await(growAnimate());
+            $await(flowAnimate());
+            $await(moveAnimate());
+
+            textAnimate().start();
+
+            $await(jumpAnimate());
+        }));
+
+        runAsync().start();
+    })();
+    </script>
+
+</script>
+</body>
+</html>
diff --git a/_config.yml b/_config.yml
@@ -1,17 +1,15 @@
 # Site settings
-title: Your awesome title
-email: your-email@domain.com
+title: 吴心翔的博客
+email: blackwuxin@126.com
 description: > # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
+  吴心翔的博客
 baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://yourdomain.com" # the base hostname & protocol for your site
+url: "http://blackwuixn.github.io" # the base hostname & protocol for your site
 
 
 # Sidebar filter
 # Choose 'tag' or 'category' as filter in sidebar.
-filter: 'tag'
+filter: 'category'
 
 
 # Social account
@@ -36,3 +34,5 @@ sass:
   style: compressed
 gems:
   - jekyll-sitemap
+
+theme: jekyll-theme-cayman
diff --git a/_includes/head.html b/_includes/head.html
@@ -6,10 +6,10 @@
 
   <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 href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600|Droid+Sans+Mono' rel='stylesheet' type='text/css'> -->
   <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="canonical" href="{{ page.url | replace:'Xiao.htm','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
 
   <script src="{{ "/assets/js/prefixfree.js" | prepend: site.baseurl }}"></script>

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -4,11 +4,11 @@
       <img id="sidebar-avatar-img" alt="{{ site.tittle }}" src="{{ "/assets/img/avatar.jpg" | prepend: site.baseurl }}"/>
     </a>
 
-    <div id="sidebar-social">
-      <a href="{{ "/feed.xml" | prepend: site.baseurl }}" class="sidebar-social-icon feed"></a>
-      <a href="mailto:{{ site.email }}" class="sidebar-social-icon email"></a>
-      {% include social.html %}
-    </div>
+    <!--<div id="sidebar-social">-->
+    <!--  <a href="{{ "/feed.xml" | 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>

diff --git a/_posts/2015-03-08-welcome-to-jekyll.markdown b/_posts/2015-03-08-welcome-to-jekyll.markdown