diff --git a/.gitignore b/.gitignore
index 6266b46a2b..d0174fbbb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
-_site/
-.sass-cache/
-*.DS_Store
-.idea
-*.swp
-.Trashes
\ No newline at end of file
+_site/*
+_theme_packages/*
+
+Thumbs.db
+.DS_Store
+
+!.gitkeep
+
+.rbenv-version
+.rvmrc
diff --git a/404.html b/404.html
old mode 100755
new mode 100644
index 6aa660dc28..6904bcdd60
--- a/404.html
+++ b/404.html
@@ -1,25 +1 @@
----
-layout: default
-description: "你来到了没有知识的荒原 :("
-header-img: "images/404-bg.jpg"
-permalink: /404.html
----
-
-
-
-404
- {{ page.description }}
- 微信二维码
-
-支付宝二维码
-
-
-
-#### 感谢
-
-本博客在[Vno Jekyll](https://github.com/onevcat/vno-jekyll)基础上修改的。
\ No newline at end of file
+* 基于jekyll的blog
+* 使用了bootstrap框架
+* 使用font-awesome进行修饰
diff --git a/_config.yml b/_config.yml
old mode 100755
new mode 100644
index 9795797653..2d73eeb69f
--- a/_config.yml
+++ b/_config.yml
@@ -1,79 +1,120 @@
-# Basic
-title: 潘柏信
-subtitle: 个人站
-description: 欢迎来到我的个人站~
-# 头像里面的标题
-avatarTitle: leopardpan
-# 头像里面的描述
-avatarDesc: iOS / 机器学习
-url: "http://leopardpan.cn"
-
-# 博客是否自动生成目录,false为不生成
-enableToc: true
-
-# Comment
-comment:
- # livere: MTAyMC81MDk5NC8yNzQ3Ng # https://www.livere.com
- disqus: leopard
- # uyan: 2143225 # 有言id,登录有言官网申请
-
-# Social
-social:
- weibo: 5366874726
- github: leopardpan
- # zhihu: panpanleopard
- # juejin: xxx
- jianshu: 2ada30d8d0f7
- # twitter:
- mail: leopardpan@icloud.com
-
-
-# 百度统计
-# 使用博客模板请去掉或者更换 id
-baidu:
- id: 8ba1c6be0953b6f9c2ba38e57f615421
-
-# Google Analytics
-# 使用博客模板请去掉或者更换 id
-ga:
- id: UA-84134159-3
- host: auto
-
+# This is the default format.
+# For more see: http://jekyllrb.com/docs/permalinks/
+permalink: /:year/:month/:day/:title
+markdown: rdiscount
+exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
+highlighter: rouge
+#mardown: redcarpet
-# 《----------------- 上面的信息修改成你自己的 ---------------------------》
+safe: false
+# Themes are encouraged to use these universal variables
+# so be sure to set them if your theme uses them.
#
+title : 潘柏信
+tagline: Site Tagline
+author :
+ name : 潘柏信
+ email : panbaixin123@163.com
+ github : leopardpan
+ twitter : leopardpan
+ feedburner : leopardpan
+
+# The production_url is only used when full-domain names are needed
+# such as sitemap.txt
+# Most places will/should use BASE_PATH to make the urls
#
-# _post/ 下的文章更换成你自己的文章
-# 帮忙star一下,感谢~😆 地址: https://github.com/leopardpan/leopardpan.github.io
+# If you have set a CNAME (pages.github.com) set your custom domain here.
+# 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.
#
-#
-# 《--------------- 下面的信息可以自行选择是否修改 ------------------------》
-
-
-permalink: /:year/:month/:title/
-# Format
-highlighter: rouge
-
-textColor: #FF0000
-
-# supported colors: blue, green, purple, red, orange or slate. If you need clear, leave it empty.
-cover_color: clear
-
-# The blog button should not be removed.
-blog_button:
- title: 博客主页
-
-# Navigation buttons in the front page.s
-nav:
- - {title: 所有文章, description: archive, url: '/archive'}
- - {title: 标签, description: tags, url: '/tags'}
- - {title: 技术支持, description: support, url: '/support'}
- - {title: 关于我, description: about, url: '/about'}
-
-
-# Pagination
-gems: [jekyll-paginate,jekyll-sitemap]
-paginate: 20
-paginate_path: "page/:num/"
-
+production_url : leopardpan.com
+# All Jekyll-Bootstrap specific configurations are namespaced into this hash
+#
+JB :
+ version : 0.3.0
+
+ # All links will be namespaced by BASE_PATH if defined.
+ # Links in your website should always be prefixed with {{BASE_PATH}}
+ # however this value will be dynamically changed depending on your deployment situation.
+ #
+ # CNAME (http://yourcustomdomain.com)
+ # DO NOT SET BASE_PATH
+ # (urls will be prefixed with "/" and work relatively)
+ #
+ # GitHub Pages (http://username.github.io)
+ # DO NOT SET BASE_PATH
+ # (urls will be prefixed with "/" and work relatively)
+ #
+ # GitHub Project Pages (http://username.github.io/project-name)
+ #
+ # A GitHub Project site exists in the `gh-pages` branch of one of your repositories.
+ # REQUIRED! Set BASE_PATH to: http://username.github.io/project-name
+ #
+ # CAUTION:
+ # - When in Localhost, your site will run from root "/" regardless of BASE_PATH
+ # - 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 : /blog
+
+ # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
+ # ex: [BASE_PATH]/assets/themes/[THEME-NAME]
+ #
+ # Override this by defining an absolute path to assets here.
+ # ex:
+ # http://s3.amazonaws.com/yoursite/themes/watermelon
+ # /assets
+ #
+ 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.
+ #
+ archive_path: /archive.html
+ categories_path : /categories.html
+ tags_path : /tags.html
+ atom_path : /atom.xml
+ rss_path : /rss.xml
+
+ # Settings for comments helper
+ # Set 'provider' to the comment provider you want to use.
+ # Set 'provider' to false to turn commenting off globally.
+ #
+ comments :
+ provider : disqus
+ disqus :
+ short_name : jekyllbootstrap
+ livefyre :
+ site_id : 123
+ intensedebate :
+ account : 123abc
+ facebook :
+ appid : 123
+ num_posts: 5
+ width: 580
+ colorscheme: light
+
+ # Settings for analytics helper
+ # Set 'provider' to the analytics provider you want to use.
+ # Set 'provider' to false to turn analytics off globally.
+ #
+ analytics :
+ provider : google
+ google :
+ tracking_id : 'UA-50637568-1'
+ getclicky :
+ site_id :
+ mixpanel :
+ token : '_MIXPANEL_TOKEN_'
+ # piwik :
+ # baseURL : 'myserver.tld/piwik' # Piwik installation address (without protocol)
+ # idsite : '1' # the id of the site on Piwik
+
+ # Settings for sharing helper.
+ # Sharing is for things like tweet, plusone, like, reddit buttons etc.
+ # Set 'provider' to the sharing provider you want to use.
+ # Set 'provider' to false to turn sharing off globally.
+ #
+ sharing :
+ provider : false
diff --git a/_includes/JB/analytics b/_includes/JB/analytics
new file mode 100644
index 0000000000..951a0e3d8d
--- /dev/null
+++ b/_includes/JB/analytics
@@ -0,0 +1,16 @@
+{% if site.safe and site.JB.analytics.provider and page.JB.analytics != false %}
+
+{% case site.JB.analytics.provider %}
+{% when "google" %}
+ {% include JB/analytics-providers/google %}
+{% when "getclicky" %}
+ {% include JB/analytics-providers/getclicky %}
+{% when "mixpanel" %}
+ {% include JB/analytics-providers/mixpanel %}
+{% when "piwik" %}
+ {% include JB/analytics-providers/piwik %}
+{% when "custom" %}
+ {% include custom/analytics %}
+{% endcase %}
+
+{% endif %}
\ No newline at end of file
diff --git a/_includes/JB/analytics-providers/getclicky b/_includes/JB/analytics-providers/getclicky
new file mode 100644
index 0000000000..e9462f4f67
--- /dev/null
+++ b/_includes/JB/analytics-providers/getclicky
@@ -0,0 +1,12 @@
+
+
diff --git a/_includes/JB/analytics-providers/google b/_includes/JB/analytics-providers/google
new file mode 100644
index 0000000000..9014866a40
--- /dev/null
+++ b/_includes/JB/analytics-providers/google
@@ -0,0 +1,11 @@
+
\ No newline at end of file
diff --git a/_includes/JB/analytics-providers/mixpanel b/_includes/JB/analytics-providers/mixpanel
new file mode 100644
index 0000000000..4406eb048d
--- /dev/null
+++ b/_includes/JB/analytics-providers/mixpanel
@@ -0,0 +1,11 @@
+
\ No newline at end of file
diff --git a/_includes/JB/analytics-providers/piwik b/_includes/JB/analytics-providers/piwik
new file mode 100755
index 0000000000..077a373a4b
--- /dev/null
+++ b/_includes/JB/analytics-providers/piwik
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list
new file mode 100644
index 0000000000..83be2e2900
--- /dev/null
+++ b/_includes/JB/categories_list
@@ -0,0 +1,37 @@
+{% comment %}{% endcomment %}
+
+{% if site.JB.categories_list.provider == "custom" %}
+ {% include custom/categories_list %}
+{% else %}
+ {% if categories_list.first[0] == null %}
+ {% for category in categories_list %}
+
{{text | replace:"|.", "{" | replace:".|", "}" | replace:">", ">" | replace:"<", "<" }}
+{% endif %}
+{% assign text = nil %}
\ No newline at end of file
diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate
index f143b2c3a1..a3a6a4066f 100644
--- a/_includes/JB/posts_collate
+++ b/_includes/JB/posts_collate
@@ -29,21 +29,14 @@ Usage:
{% if forloop.first %}
-