change them

Author: mkirin

README.md

@@ -1,40 +1,5 @@
-# Jekyll-Bootstrap
+#jekylll blog
 
-The quickest way to start and publish your Jekyll powered blog. 100% compatible with GitHub pages
-
-## Usage
-
-For all usage and documentation please see: <http://jekyllbootstrap.com>
-
-## Version
-
-0.3.0 - stable and versioned using [semantic versioning](http://semver.org/).
-
-**NOTE:** 0.3.0 introduces a new theme which is not backwards compatible in the sense it won't _look_ like the old version.
-However, the actual API has not changed at all.
-You might want to run 0.3.0 in a branch to make sure you are ok with the theme design changes.
-
-## Contributing
-
-
-To contribute to the framework please make sure to checkout your branch based on `jb-development`!!
-This is very important as it allows me to accept your pull request without having to publish a public version release.
-
-Small, atomic Features, bugs, etc.
-Use the `jb-development` branch but note it will likely change fast as pull requests are accepted.
-Please rebase as often as possible when working.
-Work on small, atomic features/bugs to avoid upstream commits affecting/breaking your development work.
-
-For Big Features or major API extensions/edits:
-This is the one case where I'll accept pull-requests based off the master branch.
-This allows you to work in isolation but it means I'll have to manually merge your work into the next public release.
-Translation : it might take a bit longer so please be patient! (but sincerely thank you).
-
-**Jekyll-Bootstrap Documentation Website.**
-
-The documentation website at <http://jekyllbootstrap.com> is maintained at https://github.com/plusjade/jekyllbootstrap.com
-
-
-## License
-
-[MIT](http://opensource.org/licenses/MIT)
+* 基于jekyll的blog
+* 使用了bootstrap框架
+* 使用font-awesome进行修饰

_config.yml

@@ -1,17 +1,19 @@
 # This is the default format. 
 # For more see: http://jekyllrb.com/docs/permalinks/
-permalink: /:categories/:year/:month/:day/:title 
-
+permalink: /:year/:month/:day/:title 
+markdown: rdiscount
 exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
 highlighter: pygments
+#mardown: redcarpet
 
+safe: false
 # Themes are encouraged to use these universal variables 
 # so be sure to set them if your theme uses them.
 #
-title : Jekyll Bootstrap
+title : 寂寞先生
 tagline: Site Tagline
 author :
-  name : Name Lastname
+  name : 陈佳伟
   email : [email protected]
   github : username
   twitter : username
@@ -25,7 +27,7 @@ author :
 # Else if you are pushing to username.github.io, replace with your username.
 # Finally if you are pushing to a GitHub project page, include the project name at the end.
 #
-production_url : http://username.github.io
+production_url : http://enml.github.io/blog
 
 # All Jekyll-Bootstrap specific configurations are namespaced into this hash
 #
@@ -54,7 +56,7 @@ JB :
   #   - Only the following values are falsy: ["", null, false]
   #   - When setting BASE_PATH it must be a valid url.
   #     This means always setting the protocol (http|https) or prefixing with "/"
-  BASE_PATH : false
+  BASE_PATH : /blog
 
   # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
   # ex: [BASE_PATH]/assets/themes/[THEME-NAME]
@@ -64,7 +66,7 @@ JB :
   #   http://s3.amazonaws.com/yoursite/themes/watermelon
   #   /assets
   #
-  ASSET_PATH : false
+  ASSET_PATH : False
 
   # These paths are to the main pages Jekyll-Bootstrap ships with.
   # Some JB helpers refer to these paths; change them here if needed.
@@ -100,7 +102,7 @@ JB :
   analytics :
     provider : google 
     google : 
-        tracking_id : 'UA-123-12'
+        tracking_id : 'UA-50637568-1'
     getclicky :
       site_id : 
     mixpanel :

_includes/JB/liquid_raw

@@ -7,7 +7,7 @@ Using one will break the other if you plan to deploy to GitHub pages.
   see: https://github.com/mojombo/jekyll/issues/425
 
 Since I don't want to mess with Liquid versions, I'll just rewrite the way I 
-intend to give liquid examples. It's not an elegant solution by any means:
+intend to give liquid examples. It's not an elegant by any means:
 
 Usage: 
   1) Define a 'text' variable with the block of liquid code you intend to display.

_includes/JB/posts_collate

@@ -27,19 +27,30 @@ Usage:
     {% capture next_month %}{{ post.previous.date | date: "%B" }}{% endcapture %}
 
     {% if forloop.first %}
-      <h2>{{this_year}}</h2>
+    
+    
+      <div class="hat_title">{{this_year}}</div>
+      <div class="post_list">
       <h3>{{this_month}}</h3>
       <ul>
+      
     {% endif %}
 
     <li><span>{{ post.date | date: "%B %e, %Y" }}</span> &raquo; <a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
-  
+ 
     {% if forloop.last %}
       </ul>
+      
     {% else %}
       {% if this_year != next_year %}
         </ul>
-        <h2>{{next_year}}</h2>
+         </div>
+         
+         
+         
+         
+        <div class="hat_title">{{next_year}}</div>
+        <div class="post_list">
         <h3>{{next_month}}</h3>
         <ul>
       {% else %}    
@@ -52,4 +63,4 @@ Usage:
     {% endif %}
   {% endfor %}
 {% endif %}
-{% assign posts_collate = nil %}
+{% assign posts_collate = nil %}</div>

_includes/themes/twitter/default.html

@@ -17,7 +17,8 @@
     <!-- Le styles -->
     <link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.2.2.2.min.css" rel="stylesheet">
     <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
-
+    <link href="{{ ASSET_PATH }}/css/prettify.css" rel="stylesheet" type="text/css">
+    <script src="{{ ASSET_PATH }}/js/prettify.js"></script>
     <!-- Le fav and touch icons -->
   <!-- Update these with your own images
     <link rel="shortcut icon" href="images/favicon.ico">
@@ -29,14 +30,17 @@
     <!-- atom & rss feed -->
     <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
     <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
-
+    
+<!--    font-awesome-->
+<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
+  
   </head>
 
-  <body>
+  <body onload="prettyPrint()">
     <div class="navbar">
       <div class="navbar-inner">
-        <div class="container-narrow">
-          <a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
+       <div class="nav-narrow">
+          <a class="brand" href="{{ HOME_PATH }}"><span class="fa fa-mortar-board (alias)">{{ site.title }}</span></a>
           <ul class="nav">
             {% assign pages_list = site.pages %}
             {% assign group = 'navigation' %}
@@ -51,12 +55,14 @@
       <div class="content">
         {{ content }}
       </div>
-      <hr>
-      <footer>
-        <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
+      
+      <footer class="card clearfix">
+        <span style="font-size:30px;"class="fa fa-github pull-left"></span><a href="https://github.com/enml/blog/tree/jekyll-blog" style="display:inline-block;padding-right:80px;border-right:1px solid #bbb">fork me on GitHub</a>
+        <p class="pull-right">&copy; 2011 {{ site.author.name }}
           with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
           and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
         </p>
+        
       </footer>
 
     </div>

_includes/themes/twitter/page.html

@@ -1,6 +1,8 @@
+<!--
 <div class="page-header">
   <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
 </div>
+-->
 
 <div class="row-fluid">
   <div class="span12">

_includes/themes/twitter/post.html

@@ -1,49 +1,57 @@
+<!--
 <div class="page-header">
   <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endif %}</h1>
 </div>
+-->
+ 
 
 <div class="row-fluid post-full">
-  <div class="span12">
-    <div class="date">
-      <span>{{ page.date | date_to_long_string }}</span>
-    </div>
-    <div class="content">
+  <div class="span12 ">
+    <div class="content card">
+        <div class="date_label">
+          <div class="day_month">
+          {{ page.date | date:"%m/%d" }}
+          </div>
+          <div class="year">
+          {{ page.date | date:"%Y" }}
+          </div>
+        </div>
       {{ content }}
     </div>
 
-  {% unless page.categories == empty %}
-    <ul class="tag_box inline">
+ 
+<!--{% unless page.categories == empty %}
+    <ul class="tag_box inline ">
       <li><i class="icon-folder-open"></i></li>
       {% assign categories_list = page.categories %}
       {% include JB/categories_list %}
     </ul>
   {% endunless %}  
 
   {% unless page.tags == empty %}
-    <ul class="tag_box inline">
+    <ul class="tag_box inline ">
       <li><i class="icon-tags"></i></li>
       {% assign tags_list = page.tags %}
       {% include JB/tags_list %}
     </ul>
-  {% endunless %}  
-
-    <hr>
-    <div class="pagination">
-      <ul>
+  {% endunless %}  -->
+    
+    <div class="pagination clearfix">
+      <ul class = "pull-right">
       {% if page.previous %}
-        <li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&larr; Previous</a></li>
+        <li class="prev"><a class="fa fa-arrow-circle-left" href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}"> 前一篇</a></li>
       {% else %}
-        <li class="prev disabled"><a>&larr; Previous</a></li>
+        <li class="prev disabled" ><a class="fa fa-arrow-circle-left"> 前一篇</a></li>
       {% endif %}
-        <li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
+        <li><a class="fa fa-th" href="{{ BASE_PATH }}{{ site.JB.archive_path }}"> 所有日志</a></li>
       {% if page.next %}
-        <li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next &rarr;</a></li>
+        <li class="next"><a  href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">后一篇 <span class="fa fa-arrow-circle-right">  </span></a></li>
       {% else %}
-        <li class="next disabled"><a>Next &rarr;</a>
+        <li class="next disabled"><a >后一篇 <span class="fa fa-arrow-circle-right">  </span></a>
       {% endif %}
       </ul>
     </div>
-    <hr>
+    
     {% include JB/comments %}
   </div>
 </div>

_layouts/category_archive.html

@@ -0,0 +1,13 @@
+---
+layout: default
+---
+<div class="category-archive">
+  <div>
+    <span class="title">Category archive for {{ page.category }}</span>
+  </div>
+  <div>
+    <ul>
+{{ content }}
+    </ul>
+  </div>
+</div>

_layouts/default.html

@@ -1,6 +1,6 @@
 ---
 theme :
-  name : bootstrap-3
+  name : twitter
 ---
 {% include JB/setup %}
-{% include themes/bootstrap-3/default.html %}
+{% include themes/twitter/default.html %}

_layouts/page.html

@@ -2,4 +2,4 @@
 layout: default
 ---
 {% include JB/setup %}
-{% include themes/bootstrap-3/page.html %}
+{% include themes/twitter/page.html %}

_layouts/post.html

@@ -2,4 +2,4 @@
 layout: default
 ---
 {% include JB/setup %}
-{% include themes/bootstrap-3/post.html %}
+{% include themes/twitter/post.html %}

_posts/2011-01-12-prime.md

@@ -0,0 +1,28 @@
+---
+layout: post
+title: js-算出某值以内的质数
+category : 技术分享
+tagline: "Supporting tagline"
+tags : [javascript,算法]
+published: true
+---
+{% include JB/setup %}
+# js 算出某值以内的质数
+---
+
+<pre class="prettyprint linenums">
+    //算出 num 以内的所有质数
+ 
+function prime(num){
+    var list = [];
+    for(var i = 2; i <= num; i++){ list.push(i); } //create a Array
+    
+    for(var i = 0; i < list.length; i++){
+        for(var j = 2; j < list[i]; j++){
+            if(list[i] % j == 0){
+                list.splice(i,1); //delete the non prime number.it will change the index of other elements
+                j = 2; //由于splice导致list[i+1]的index变为i,因此把j置为2以便对list[i+1]进行重新计算
+        }
+    }
+}
+</pre>

_posts/2014-04-20-githubpages.md

@@ -0,0 +1,32 @@
+---
+layout: post
+title: GitHub基础入门
+category : 技术分享
+tagline: "Supporting tagline"
+tags : jekyll, github
+published: false
+---
+{% include JB/setup %}
+
+# GitHub Pages（像黑客一样写博客）
+
+`技术`
+
+---
+
+是的，之前github的名字其实早已经如雷贯耳，只是我对它望而生畏，始终不敢去触碰它。因为它咋一看上去冷冰冰的，眼之所及，皆为代码；并且又找不到能详细却直观地描述它的理念的教程，所以我始终无从下手。
+
+终于，两天前看到**Blogging like a hacker**这篇文章，决定试试搭建一个基于**github pages**的blog，遂开始尝试。
+
+<!--break-->
+
+首先下载`github`的windows客户端，客户端很简约，这个非常值得称赞。客户端登录后会直接跟你github账号进行绑定同步，因此你能直观的看到github上你的项目文件。硬着头皮尝试各种git命令，不求甚解。以前我很讨厌这种不求甚解的状态，当我在阅读一篇教程时总是希望先了解一下基本脉络，当差不多头脑里有个整体框架后再动手，这样的好处就是你知道你每一步是在做什么，成功率也比较高。但并不是每一篇教程或者每一个项目你都能很快地掌握其基本脉络，就像github。很多教程基本就是直接说输入
+
+>```git push origin master```
+
+之类的，但他没告诉我输入之后能干什么，会发生什么。更没有人告诉我每一次必须先commit message才能提交。所以我只能糊里糊涂地跟着教程走，不过尝试了几遍之后，也就大概理解了脉络。
+
+* github为版本控制系统。也就是说，你每一次的提交都会有相关的标记，以便进行回滚和协作。
+* 对于远程代码，可以通过```git clone```语句进行clone，可以clone到本地库，也可以clone到github库中。
+* 对于本地代码，可以通过```git remote set-url```语句绑定到对应的repository；也可以通过客户端里的public推送到github上。
+* 每一次push前必须先commit -m，客户端里是填写相应的summary。