Merge pull request #3 from viosey/master

Merge Main
cubesky · Jan 5, 2017 · c9aa1e4 · c9aa1e4
2 parents 64bf736 + b075b38
commit c9aa1e4
Show file tree

Hide file tree

Showing 37 changed files with 37 additions and 9 deletions.
diff --git a/_config.yml b/_config.yml
@@ -51,7 +51,7 @@ reading:
 # Thumbnail Settings
 thumbnail:
     purecolor:
-    random_amount: 5
+    random_amount: 19
 
 # Background Settings
 # bing available parameter:
@@ -73,7 +73,7 @@ img:
     sidebar_header: "/img/sidebar_header.png"
     footerico: "/img/footer/footer_ico-"
     #upyun_logo: "/img/upyun_logo.png"
-    random_thumbnail: "/img/random/"
+    random_thumbnail: "/img/random/material-"
 
 # Custom Fonts
 fonts: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif
@@ -97,12 +97,13 @@ sns:
 
 # SNS Share Switch
 sns_share:
-  twitter: true
-  googleplus: true
-  weibo: true
-  linkedin: false
-  qq: false
-  telegram: false
+    twitter: true
+    facebook: true
+    googleplus: true
+    weibo: true
+    linkedin: false
+    qq: false
+    telegram: false
 
 # Sidebar User Dropdown
 dropdown:

diff --git a/languages/en.yml b/languages/en.yml
@@ -14,6 +14,7 @@ share:
     article_rss: "Article RSS"
     comment_rss: "Comment RSS"
     toTwitter: "Share to Twitter"
+    toFacebook: "Share to Facebook"
     toLinkedIn: "Share to LinkedIn"
     toGplus: "Share to Google+"
     toWeibo: "Share to Weibo"

diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -14,6 +14,7 @@ share:
     article_rss: "文章 RSS"
     comment_rss: "评论 RSS"
     toTwitter: "分享到 Twitter"
+    toFacebook: "分享到 Facebook"
     toLinkedIn: "分享到 LinkedIn"
     toGplus: "分享到 Google+"
     toWeibo: "分享到微博"

diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -14,6 +14,7 @@ share:
     article_rss: "文章 RSS"
     comment_rss: "評論 RSS"
     toTwitter: "分享到 Twitter"
+    toFacebook: "分享到 Facebook"
     toLinkedIn: "分享到 LinkedIn"
     toGplus: "分享到 Google+"
     toWeibo: "分享到微博"

diff --git a/layout/_partial/blog_info.ejs b/layout/_partial/blog_info.ejs
@@ -75,6 +75,14 @@
             </a>
 			<% } %>
 
+			<% if(theme.sns_share.facebook == true){ %>
+						<a class="index_share-link" href="https://www.facebook.com/sharer/sharer.php?u=<%= config.url + config.root + url_for(path) %>" target="_blank">
+								<li class="mdl-menu__item mdl-js-ripple-effect">
+										<%= __('share.toFacebook') %>
+								</li>
+						</a>
+			<% } %>
+
 			<% if(theme.sns_share.googleplus == true){ %>
             <a class="index_share-link" href="https://plus.google.com/share?url=<%- config.url + config.root %>" target="_blank">
                 <li class="mdl-menu__item mdl-js-ripple-effect">

diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -1,4 +1,11 @@
 <head>
+    <!--
+        © Material Theme 
+        https://github.com/viosey/hexo-theme-material
+        Version: 1.2.5
+        Powered by Hexo
+    -->
+
     <!-- Title -->
     <%
         var title = page.title;

diff --git a/layout/_partial/post-info-share.ejs b/layout/_partial/post-info-share.ejs
@@ -25,7 +25,7 @@
       </a>
       <% } %>
     <% } %>
-    
+
     <!-- Share Weibo -->
     <% if(theme.sns_share.weibo == true){ %>
     <a class="post_share-link" href="http://service.weibo.com/share/share.php?appkey=&title=<%= page.title %>&url=<%= config.url + config.root + url_for(path) %>&pic=&searchPic=false&style=simple" target="_blank">
@@ -44,6 +44,15 @@
     </a>
     <% } %>
 
+    <!-- Share Facebook -->
+    <% if(theme.sns_share.facebook == true){ %>
+    <a class="post_share-link" href="https://www.facebook.com/sharer/sharer.php?u=<%= config.url + config.root + url_for(path) %>" target="_blank">
+        <li class="mdl-menu__item">
+            <%= __('share.toFacebook') %>
+        </li>
+    </a>
+    <% } %>
+
     <!-- Share Google+ -->
     <% if(theme.sns_share.googleplus == true){ %>
     <a class="post_share-link" href="https://plus.google.com/share?url=<%= config.url + config.root + url_for(path) %>" target="_blank">

diff --git a/source/img/footer/footer_ico-github.png b/source/img/footer/footer_ico-github.png
diff --git a/source/img/footer/footer_ico-instagram.png b/source/img/footer/footer_ico-instagram.png
diff --git a/source/img/footer/footer_ico-linkedin.png b/source/img/footer/footer_ico-linkedin.png
diff --git a/source/img/footer/footer_ico-tumblr.png b/source/img/footer/footer_ico-tumblr.png
diff --git a/source/img/footer/footer_ico-weibo.png b/source/img/footer/footer_ico-weibo.png
diff --git a/source/img/footer/footer_ico-zhihu.png b/source/img/footer/footer_ico-zhihu.png
diff --git a/source/img/random/1.png b/source/img/random/1.png
diff --git a/source/img/random/2.png b/source/img/random/2.png
diff --git a/source/img/random/3.png b/source/img/random/3.png
diff --git a/source/img/random/4.png b/source/img/random/4.png
diff --git a/source/img/random/5.png b/source/img/random/5.png
diff --git a/source/img/random/material-1.png b/source/img/random/material-1.png
diff --git a/source/img/random/material-10.png b/source/img/random/material-10.png
diff --git a/source/img/random/material-11.png b/source/img/random/material-11.png
diff --git a/source/img/random/material-12.png b/source/img/random/material-12.png
diff --git a/source/img/random/material-13.png b/source/img/random/material-13.png
diff --git a/source/img/random/material-14.png b/source/img/random/material-14.png
diff --git a/source/img/random/material-15.png b/source/img/random/material-15.png
diff --git a/source/img/random/material-16.png b/source/img/random/material-16.png
diff --git a/source/img/random/material-17.png b/source/img/random/material-17.png
diff --git a/source/img/random/material-18.png b/source/img/random/material-18.png
diff --git a/source/img/random/material-19.png b/source/img/random/material-19.png
diff --git a/source/img/random/material-2.png b/source/img/random/material-2.png
diff --git a/source/img/random/material-3.png b/source/img/random/material-3.png
diff --git a/source/img/random/material-4.png b/source/img/random/material-4.png
diff --git a/source/img/random/material-5.png b/source/img/random/material-5.png
diff --git a/source/img/random/material-6.png b/source/img/random/material-6.png
diff --git a/source/img/random/material-7.png b/source/img/random/material-7.png
diff --git a/source/img/random/material-8.png b/source/img/random/material-8.png
diff --git a/source/img/random/material-9.png b/source/img/random/material-9.png