Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Main #3

Merged
merged 15 commits into from
Jan 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ reading:
# Thumbnail Settings
thumbnail:
purecolor:
random_amount: 5
random_amount: 19

# Background Settings
# bing available parameter:
Expand All @@ -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
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions languages/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions languages/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ share:
article_rss: "文章 RSS"
comment_rss: "评论 RSS"
toTwitter: "分享到 Twitter"
toFacebook: "分享到 Facebook"
toLinkedIn: "分享到 LinkedIn"
toGplus: "分享到 Google+"
toWeibo: "分享到微博"
Expand Down
1 change: 1 addition & 0 deletions languages/zh-TW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ share:
article_rss: "文章 RSS"
comment_rss: "評論 RSS"
toTwitter: "分享到 Twitter"
toFacebook: "分享到 Facebook"
toLinkedIn: "分享到 LinkedIn"
toGplus: "分享到 Google+"
toWeibo: "分享到微博"
Expand Down
8 changes: 8 additions & 0 deletions layout/_partial/blog_info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
7 changes: 7 additions & 0 deletions layout/_partial/head.ejs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
11 changes: 10 additions & 1 deletion layout/_partial/post-info-share.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down
Binary file modified source/img/footer/footer_ico-github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/img/footer/footer_ico-instagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/img/footer/footer_ico-linkedin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/img/footer/footer_ico-tumblr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/img/footer/footer_ico-weibo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/img/footer/footer_ico-zhihu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/img/random/1.png
Binary file not shown.
Binary file removed source/img/random/2.png
Binary file not shown.
Binary file removed source/img/random/3.png
Binary file not shown.
Binary file removed source/img/random/4.png
Binary file not shown.
Binary file removed source/img/random/5.png
Binary file not shown.
Binary file added source/img/random/material-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-17.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/img/random/material-5.png
Binary file added source/img/random/material-6.png
Binary file added source/img/random/material-7.png
Binary file added source/img/random/material-8.png
Binary file added source/img/random/material-9.png