正在加载搜索结果,请稍等。
From 61a425d689c1a1cfcc7c14b9160ef7835972130e Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 12:55:24 +0800
Subject: [PATCH 092/117] =?UTF-8?q?=E6=B7=BB=E5=8A=A0swiftype=E7=AB=99?=
=?UTF-8?q?=E5=86=85=E6=90=9C=E7=B4=A2js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/after_footer.ejs | 1 +
1 file changed, 1 insertion(+)
diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
index 68c5a05..46ea1ab 100755
--- a/layout/_partial/after_footer.ejs
+++ b/layout/_partial/after_footer.ejs
@@ -165,4 +165,5 @@ $(document).ready(function(){
<%- partial('baidu_analytics') %>
<%- partial('google_analytics') %>
+<%- partial('swift_search') %>
<%- partial('totop') %>
From fe089e2d24a093526d6e6605c74a348e69a92532 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 12:56:21 +0800
Subject: [PATCH 093/117] =?UTF-8?q?swiftype=E7=AB=99=E5=86=85=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/swift_search.ejs | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 layout/_partial/swift_search.ejs
diff --git a/layout/_partial/swift_search.ejs b/layout/_partial/swift_search.ejs
new file mode 100644
index 0000000..cea6fb5
--- /dev/null
+++ b/layout/_partial/swift_search.ejs
@@ -0,0 +1,10 @@
+<% if (theme.swift_search.enable){ %>
+
+<% } %>
From 32798d44d3d011b46b7fa00b7c9654580367e770 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:01:12 +0800
Subject: [PATCH 094/117] Update _config.yml
---
_config.yml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/_config.yml b/_config.yml
index 840df5c..2d002a1 100755
--- a/_config.yml
+++ b/_config.yml
@@ -81,30 +81,30 @@ jiathis:
id: ## e.g. 1501277 your jiathis ID.
tsina: ## e.g. 1664838973 Your weibo id,It will be used in share button.
-####百度统计代码
+#### 百度统计代码
baidu_analytics:
enable: true
id: # your baidu analytics id
-####百度分享
+#### 百度分享
baidu_share:
enable: true
color: 4
-####主题颜色
+#### 主题颜色
theme_color:
background: '#dddddd'
font: '#817c7c'
theme: '#8db3e2'
title: '#17365d'
-####百度站内搜索
+#### 百度站内搜索
baidu_search:
enable: true
id: ## e.g. "783281470518440642" for your baidu search id
site: http://zhannei.baidu.com/cse/search #your can change your site instead the default site
-####Google分析代码
+#### Google分析代码
google_analytics:
enable: true
id: ## e.g. UA-55273525-1 your google analytics ID.
@@ -112,7 +112,7 @@ google_analytics:
## You MUST upgrade to Universal Analytics first!
## https://developers.google.com/analytics/devguides/collection/upgrade/?hl=zh_CN
-####背景音乐
+#### 背景音乐
background_music:
enable: false
src:
@@ -127,3 +127,7 @@ google_cse:
## title: search
## ---
+#### Swiftype Search
+swift_search:
+ enable: true
+ id: ## e.g. m7b11ZrsT8Me7gzApciT
From f91f5dfb5aee4aaf8f1777331d9f4321e3b22293 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:02:05 +0800
Subject: [PATCH 095/117] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=AD=A3=E7=A1=AE?=
=?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/{baidu_analytics.ejs => baidu_share.ejs} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename layout/_partial/{baidu_analytics.ejs => baidu_share.ejs} (100%)
diff --git a/layout/_partial/baidu_analytics.ejs b/layout/_partial/baidu_share.ejs
similarity index 100%
rename from layout/_partial/baidu_analytics.ejs
rename to layout/_partial/baidu_share.ejs
From 6d7640451c525a71f00e7bf465f17383d466e888 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:02:31 +0800
Subject: [PATCH 096/117] Update after_footer.ejs
---
layout/_partial/after_footer.ejs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
index 46ea1ab..fbd84c6 100755
--- a/layout/_partial/after_footer.ejs
+++ b/layout/_partial/after_footer.ejs
@@ -163,7 +163,7 @@ $(document).ready(function(){
<% } %>
-<%- partial('baidu_analytics') %>
+<%- partial('baidu_share') %>
<%- partial('google_analytics') %>
<%- partial('swift_search') %>
<%- partial('totop') %>
From c4316747ae3bf9c0b8b92f2546e593d921d1f642 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:07:08 +0800
Subject: [PATCH 097/117] Update _config.yml
---
_config.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/_config.yml b/_config.yml
index 2d002a1..88bb4ac 100755
--- a/_config.yml
+++ b/_config.yml
@@ -16,7 +16,7 @@ widgets:
- tag
- recent_comments
- links
-## provide seven widgets:category,tag,rss,archive,tagcloud,links,recent_comments
+## provide seven widgets: category,tag,rss,archive,tagcloud,links,recent_comments
#### RSS
rss: atom.xml ## RSS address.
@@ -56,14 +56,14 @@ fancybox: true
#### Author information
author:
- google_plus: ## eg:116338260303228776998 for https://plus.google.com/u/0/116338260303228776998,不会展示,但填写后文章作者链接会指向google plus
- weibo: ## e.g. 436062867 for http://weibo.com/436062867
- twitter: ## e.g. gengbiaosky for https://twitter.com/gengbiaosky
- github: ## e.g. coneycode for https://github.com/coneycode
- facebook: ## e.g. gengbiao for https://www.facebook.com/gengbiao
- instagram: ## e.g. coney for htp://instagram.com/coney
- emailme: ## e.g. tufu9441@gmail.com for mailto:tufu9441@gmail.com
- rsslink: ## e.g. haomwei.com/atom.xml for http://haomwei.com/atom.xml
+ google_plus: ## e.g. 116338260303228776998 for https://plus.google.com/u/0/116338260303228776998,不会展示,但填写后文章作者链接会指向google plus
+ weibo: ## e.g. 436062867 for http://weibo.com/436062867
+ twitter: ## e.g. gengbiaosky for https://twitter.com/gengbiaosky
+ github: ## e.g. coneycode for https://github.com/coneycode
+ facebook: ## e.g. gengbiao for https://www.facebook.com/gengbiao
+ instagram: ## e.g. coney for htp://instagram.com/coney
+ emailme: ## e.g. tufu9441@gmail.com for mailto:tufu9441@gmail.com
+ rsslink: ## e.g. haomwei.com/atom.xml for http://haomwei.com/atom.xml
#### Comment
duoshuo:
@@ -127,7 +127,7 @@ google_cse:
## title: search
## ---
-#### Swiftype Search
+#### Swiftype自定义搜索
swift_search:
enable: true
id: ## e.g. m7b11ZrsT8Me7gzApciT
From 03869338157ac8c551b2ce8c9dee6399ca1ee613 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:08:30 +0800
Subject: [PATCH 098/117] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=9D=E5=B8=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/ribbon.ejs | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 layout/_partial/ribbon.ejs
diff --git a/layout/_partial/ribbon.ejs b/layout/_partial/ribbon.ejs
deleted file mode 100644
index 1314237..0000000
--- a/layout/_partial/ribbon.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-
From afbc80ea2bd886444bb15916f6543bc79a3809fd Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 13:10:40 +0800
Subject: [PATCH 099/117] =?UTF-8?q?=E5=A2=9E=E5=A4=A7=E6=A0=87=E7=AD=BE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E7=9B=AE=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_widget/tag.ejs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/layout/_widget/tag.ejs b/layout/_widget/tag.ejs
index 695e559..ef15f5e 100755
--- a/layout/_widget/tag.ejs
+++ b/layout/_widget/tag.ejs
@@ -2,9 +2,9 @@
-<% } %>
\ No newline at end of file
+<% } %>
From 8d8b65736c0593d14b53abf0d5a58d2c676a4a99 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 14:43:36 +0800
Subject: [PATCH 100/117] =?UTF-8?q?=E5=AE=8C=E5=96=84swiftype=E7=AB=99?=
=?UTF-8?q?=E5=86=85=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/search.ejs | 55 +++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/layout/_partial/search.ejs b/layout/_partial/search.ejs
index a2d75a3..a8f1fc6 100755
--- a/layout/_partial/search.ejs
+++ b/layout/_partial/search.ejs
@@ -1,7 +1,27 @@
-<% if(theme.swift_search.enable) { %>
-
-
正在加载搜索结果,请稍等。
-
-<% } %>
-
-<% if(theme.google_cse.enable) { %>
-
-
-
+}
+
<% } %>
From 2a3ab0d7842084a405488022e19407de82bb60ea Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 14:44:19 +0800
Subject: [PATCH 101/117] =?UTF-8?q?=E6=B7=BB=E5=8A=A0swiftype=E7=AB=99?=
=?UTF-8?q?=E5=86=85=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/_partial/header.ejs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index b06665a..5a9c12f 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -14,8 +14,8 @@
<% for (var i in theme.menu){ %>
- - <%= i %>
- <% } %>
+ - <%= i %>
+ <% } %>
-
<% if (theme.google_cse&&theme.google_cse.enable){ %>
<% } else { %>
-
+
From 33716c03f11a628dad3cf93d3e77fc76ecdca92e Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 14:45:02 +0800
Subject: [PATCH 102/117] Update and rename swift_search.ejs to
swiftype_search.ejs
---
layout/_partial/{swift_search.ejs => swiftype_search.ejs} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename layout/_partial/{swift_search.ejs => swiftype_search.ejs} (78%)
diff --git a/layout/_partial/swift_search.ejs b/layout/_partial/swiftype_search.ejs
similarity index 78%
rename from layout/_partial/swift_search.ejs
rename to layout/_partial/swiftype_search.ejs
index cea6fb5..ff4f2f0 100644
--- a/layout/_partial/swift_search.ejs
+++ b/layout/_partial/swiftype_search.ejs
@@ -1,10 +1,10 @@
-<% if (theme.swift_search.enable){ %>
+<% if (theme.swiftype_search.enable){ %>
<% } %>
From 07c73a53db25e45b3bc59e1cb88bcf69c2823e82 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 14:45:31 +0800
Subject: [PATCH 103/117] Update after_footer.ejs
---
layout/_partial/after_footer.ejs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
index fbd84c6..8a4322e 100755
--- a/layout/_partial/after_footer.ejs
+++ b/layout/_partial/after_footer.ejs
@@ -165,5 +165,5 @@ $(document).ready(function(){
<%- partial('baidu_share') %>
<%- partial('google_analytics') %>
-<%- partial('swift_search') %>
+<%- partial('swiftype_search') %>
<%- partial('totop') %>
From 425fc5e4be1ee2e331571173fe659c4638d5006f Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 14:46:14 +0800
Subject: [PATCH 104/117] Update _config.yml
---
_config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_config.yml b/_config.yml
index 88bb4ac..959d787 100755
--- a/_config.yml
+++ b/_config.yml
@@ -127,7 +127,7 @@ google_cse:
## title: search
## ---
-#### Swiftype自定义搜索
-swift_search:
+#### Swiftype站内搜索
+swiftype_search:
enable: true
id: ## e.g. m7b11ZrsT8Me7gzApciT
From 06d7c9b986bcbfe6803c860d5aad2124f2eff3c7 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 15:10:42 +0800
Subject: [PATCH 105/117] Update _config.yml
---
_config.yml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/_config.yml b/_config.yml
index 959d787..31ff577 100755
--- a/_config.yml
+++ b/_config.yml
@@ -54,7 +54,7 @@ fancybox: true
## if you want use fancybox in ANY post please copy the file `fancybox.js`.
## in theme folder `/coney/scripts` to your hexo blog folder `../scritps`.
-#### Author information
+#### 作者信息
author:
google_plus: ## e.g. 116338260303228776998 for https://plus.google.com/u/0/116338260303228776998,不会展示,但填写后文章作者链接会指向google plus
weibo: ## e.g. 436062867 for http://weibo.com/436062867
@@ -65,12 +65,12 @@ author:
emailme: ## e.g. tufu9441@gmail.com for mailto:tufu9441@gmail.com
rsslink: ## e.g. haomwei.com/atom.xml for http://haomwei.com/atom.xml
-#### Comment
+#### 多说评论系统
duoshuo:
enable: true ## duoshuo.com
short_name: ## e.g. coney,duoshuo short name.
-#### Links
+#### 友情链接
links:
码农圈: https://coderq.com,一个面向程序员交流分享的新一代社区
屠城: http://haomwei.com
@@ -131,3 +131,9 @@ google_cse:
swiftype_search:
enable: true
id: ## e.g. m7b11ZrsT8Me7gzApciT
+
+#### 代码高亮
+highlight:
+ enable: true
+ line_number: true
+ tab_replace:
From ce36ed803d31d1c82271a29e437fa2ace36de2f8 Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Sun, 29 Mar 2015 15:11:13 +0800
Subject: [PATCH 106/117] Update variable.styl
---
source/css/_base/variable.styl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/source/css/_base/variable.styl b/source/css/_base/variable.styl
index e7d1623..92d095b 100755
--- a/source/css/_base/variable.styl
+++ b/source/css/_base/variable.styl
@@ -68,3 +68,7 @@ root = hexo-config("root")
//comment
duoshuo = hexo-config("duoshuo.enable")
+
+
+//highlight
+highlight = hexo-config("highlight.enable")
From e6f40c8cc9bdff37771b2ef8794fcc20fc380bed Mon Sep 17 00:00:00 2001
From: tufu9441
Date: Fri, 3 Apr 2015 14:28:21 +0800
Subject: [PATCH 107/117] Update header.ejs
---
layout/_partial/header.ejs | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 5a9c12f..ecc2b92 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -23,14 +23,15 @@
<% } else if(theme.baidu_search&&theme.baidu_search.enable){ %>
-
+ <% } else if(theme.swiftype_search&&theme.swiftype_search.enable){ %>
+
+
<% } else { %>