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

1.3.0 #183

Merged
merged 120 commits into from
Feb 22, 2017
Merged

1.3.0 #183

Show file tree
Hide file tree
Changes from 87 commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
e9db340
feat(keywords): add post keywords as meta keywords
pidupuis Jan 16, 2017
9afaf87
chore(doc): add issue template
pidupuis Jan 16, 2017
c4a25fd
chore(doc): add pr template
pidupuis Jan 16, 2017
050efa8
chore(doc): add branch detail
pidupuis Jan 17, 2017
9d62e9e
Merge pull request #139 from viosey/chore/template
Jan 17, 2017
0226fa7
chore(doc): add contributing.md
pidupuis Jan 17, 2017
8db6d0d
Merge pull request #138 from viosey/feat/keywords
Jan 17, 2017
b3396da
refactor(config): mv _config to _config.example
Jan 17, 2017
83249b3
feat(analytics): Add Analytics
simonsmh Jan 17, 2017
1815c59
Update
Jan 17, 2017
4332f33
Merge branch 'canary' into refactor/config
Jan 17, 2017
1530c3f
Merge branch 'refactor/config' into canary
Jan 17, 2017
fa842bc
remove config.viosey from gitignore
Jan 17, 2017
f4e72cb
Merge pull request #148 from viosey/refactor/config
Jan 17, 2017
ff6355c
Merge branch 'master' into canary
Jan 17, 2017
4b155af
feat(opengraph): add opengraph support for posts
cubesky Jan 17, 2017
5631b78
Merge pull request #149 from viosey/feat/opengraph
neoFelhz Jan 17, 2017
d84c981
feat(pin): support pin posts on the top of the list
cubesky Jan 17, 2017
cdbc1c6
Merge branch 'master' into canary
Jan 17, 2017
2bf680d
Merge remote-tracking branch 'origin/canary' into canary
Jan 17, 2017
f4819b9
refactor(gitmagic): Mirror changes
cubesky Jan 17, 2017
4146238
refactor(template): add more details
pidupuis Jan 17, 2017
a55922e
Merge pull request #153 from viosey/refactor/template
pidupuis Jan 17, 2017
3cee218
Merge pull request #152 from viosey/refactor/gitmagic-changes
cubesky Jan 17, 2017
3c56b85
commit due to fire the gitmagic target
cubesky Jan 17, 2017
9ddea72
feat(post_on_top): fix codes
cubesky Jan 17, 2017
d5fe2d0
chore(gitmagic): improve rules
pidupuis Jan 17, 2017
5fd7bdc
fix(header): fix error during tag listing
pidupuis Jan 17, 2017
1c60358
Merge branch 'master' into canary
pidupuis Jan 18, 2017
743f270
chore(contributing): remove some issue rules
pidupuis Jan 19, 2017
943ca30
Merge pull request #150 from viosey/feat/pin_on_top
pidupuis Jan 19, 2017
4cd105e
feat(load): add a load queue
cubesky Jan 19, 2017
b50321a
fix(layout): fix elevation for posts
simonsmh Jan 19, 2017
41ccede
feat(background): use lazyload
cubesky Jan 19, 2017
14caa6a
add a configuration and fix layout
simonsmh Jan 20, 2017
e0c16da
feat(sidebar): add sidebar customize support
neoFelhz Jan 20, 2017
bbe9cf9
fix config
simonsmh Jan 20, 2017
955b632
fix(footer_image): footer image
simonsmh Jan 20, 2017
8a73c3e
fix
simonsmh Jan 20, 2017
56519a3
chore(contributing): remove subject length
pidupuis Jan 20, 2017
ef0c3d6
refactor(load): code style
cubesky Jan 21, 2017
e6f6cef
Merge pull request #159 from viosey/feat/load_queue
pidupuis Jan 21, 2017
00de1c0
Browsers will no longer attempt to show their own suggestions
Jan 21, 2017
d8488ae
Whoops, fixed typo correct -> complete
Jan 21, 2017
5154d63
Merge pull request #170 from theonlygusti/canary
pidupuis Jan 21, 2017
0f999a7
feat(highlight): remove highlight.js
Jan 22, 2017
a5b5d3e
feat(config): update markdown style
Jan 22, 2017
fe40c0d
minify js use YUI Compresser
Jan 22, 2017
ecd7728
fix css
simonsmh Jan 22, 2017
128294d
fix sidebar
simonsmh Jan 22, 2017
9282369
fix(sidebar): avoid bugs when user don't confgure icons on sidebar
neoFelhz Jan 22, 2017
fb07933
Merge pull request #165 from viosey/feat/sidebar
pidupuis Jan 22, 2017
6bf04a1
Merge pull request #174 from viosey/feat/highlight
pidupuis Jan 22, 2017
341c444
Merge branch 'canary' into sidebar_footer
pidupuis Jan 22, 2017
7f08939
Merge pull request #160 from simonsmh/sidebar_footer
pidupuis Jan 22, 2017
4a6c517
Merge branch 'canary' into patch-1
pidupuis Jan 22, 2017
339831f
Merge pull request #158 from simonsmh/patch-1
pidupuis Jan 22, 2017
b0ae132
refactor(config): remove duplicated option
pidupuis Jan 22, 2017
771ba1f
fix(config): fix yaml exception
pidupuis Jan 22, 2017
9626889
fix(pages): fix page link from front page
pidupuis Jan 22, 2017
266936b
fix(gallery): use lazyload
cubesky Jan 22, 2017
b90c022
chore(lint): add css linter
pidupuis Jan 22, 2017
c322f89
chore(lint): add js linter
pidupuis Jan 22, 2017
2666d8c
feat(sidebar): can hide divider and footer
pidupuis Jan 22, 2017
25c9947
Merge pull request #175 from viosey/fix/gallery
pidupuis Jan 23, 2017
6b71bae
Merge pull request #177 from viosey/master
pidupuis Jan 23, 2017
b014f43
feat(sidebar): add default icons
pidupuis Jan 25, 2017
0bd542d
Merge pull request #176 from viosey/feat/sidebar
pidupuis Jan 25, 2017
8a1176a
Update: use PaceJS instead of NProgress
Jan 22, 2017
affbd62
Add back the strange missing spaces
Jan 22, 2017
460b030
Why the spaces still missing????Atom's faule?
Jan 22, 2017
cdf8383
Add color setting for center-atom and center-radar, but they are stil…
Jan 22, 2017
96385f6
Add center-radar style
Jan 22, 2017
d2cd083
Add back the crazying missing spaces
Jan 22, 2017
4a90809
Add setting for users' own PaceJS style
Jan 24, 2017
9907b1f
Add back center-atom style
Jan 24, 2017
36cd1e6
update(feat/progressbar): make the files more accurate
Jan 24, 2017
0d7f32a
fix(feat/progressbar): add the missing spaces
Jan 24, 2017
6f95789
refactor(progressbar): simplify css import
pidupuis Jan 25, 2017
d0cd399
Merge pull request #180 from viosey/feat/progressbar
pidupuis Jan 25, 2017
123fe63
style(lint): fix quotes and strict equality
pidupuis Jan 25, 2017
7913bf0
style(lint): fix strict equality
pidupuis Jan 25, 2017
ee7ef3f
feat(comments): add "Disqus_click_to_load" to improve in-GFW-users‘ …
Kitcham Jan 26, 2017
dbef40c
feat(comments): add multilingual support for "Disqus_click_to_load" b…
Kitcham Jan 27, 2017
bed8b42
style(import): fix css indent
pidupuis Jan 28, 2017
a5e3220
style(footer-option): use single quotes
pidupuis Jan 28, 2017
2bf5f13
docs(contributing): add english version
pidupuis Jan 28, 2017
31974fd
docs(contributing): fix relative link
pidupuis Jan 28, 2017
82d613a
style(indent): remove tabs
pidupuis Jan 28, 2017
62045e8
fix(head): fix head import
pidupuis Jan 29, 2017
4a0d7da
refactor(import): move js import for perf
pidupuis Jan 29, 2017
c557d21
fix(jsload): fix queue load in head.ejs
cubesky Jan 29, 2017
3bde170
fix(jsload): uc browser compatible function
cubesky Jan 29, 2017
c8f6658
Merge pull request #186 from viosey/fix/jsload
pidupuis Jan 29, 2017
d1c05fe
refactor(progressbar): revert NProgress
Jan 30, 2017
e4d3366
Add the "lang" to <html>.
EYHN Feb 1, 2017
89c0157
Merge pull request #189 from EYHN/Add-the-lang-to-<html>
cubesky Feb 2, 2017
d7a9b69
Merge pull request #187 from viosey/refactor/progressbar
neoFelhz Feb 10, 2017
eae6960
Merge pull request #182 from Kitcham/canary
neoFelhz Feb 10, 2017
2093db0
fix(comment):duoshuo comment counts display issues and some other errors
Feb 10, 2017
99b9b60
fix(lang): update en
pidupuis Feb 10, 2017
3050589
fix(lang): update fr
pidupuis Feb 10, 2017
72adfb2
fix(disqusclick)
cubesky Feb 11, 2017
e62ff46
fix(nprogress)
cubesky Feb 11, 2017
a73b0d4
docs(readme): add read contributing rules.
neoFelhz Feb 11, 2017
01e67d8
Merge pull request #199 from viosey/fix/nprogress
neoFelhz Feb 11, 2017
e038d49
Merge pull request #198 from viosey/chore/README.md
neoFelhz Feb 11, 2017
97f91c0
Added Portuguese Brazil language translation
rickbenetti Feb 13, 2017
424093e
Merge pull request #202 from rkb81/pt-BR
Feb 15, 2017
8070929
update config.template
Feb 16, 2017
c425977
feat(dropdown): rotate caret when dropdown is opened
Feb 16, 2017
8ba43c3
Merge pull request #200 from viosey/fix/disqusclick
neoFelhz Feb 16, 2017
b23b0ee
refactor(version): update 1.2.6 to 1.3.0
cubesky Feb 16, 2017
49147a4
Merge pull request #206 from viosey/refactor/version
cubesky Feb 16, 2017
855bdb9
fix(disqus_click_btn): change disqus_click button style from button t…
cubesky Feb 16, 2017
e1c8542
Merge pull request #207 from viosey/fix/disqus_click_btn
cubesky Feb 16, 2017
d454418
refactor(version): update 1.2.6 to 1.3.0
neoFelhz Feb 17, 2017
6fa4420
Merge branch 'canary' of https://github.com/viosey/hexo-theme-materia…
neoFelhz Feb 17, 2017
e52a706
Merge branch 'canary' of https://github.com/viosey/hexo-theme-materia…
neoFelhz Feb 17, 2017
15f2571
refactor(tag)
cubesky Feb 17, 2017
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
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "airbnb-base",
"plugins": [
"import"
]
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

npm-debug.log

_config.viosey.yml
_config.yml

node_modules
103 changes: 103 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@


# Commit message format

*Read this in other languages: [English](CONTRIBUTING.md), [简体中文](CONTRIBUTING.zh-cn.md).*

## 1. Title (Header)

**(1)type**

`type` is used to describe the commit class. It must be one of the following:

>- feat: A new feature
- fix: A bug fix
- docs: Documentation only changes
- style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
- refactor: A code change that neither fixes a bug nor adds a feature
- test: Adding missing tests or correcting existing tests
- chore: Changes that affect the build system or external dependencies


**(2)scope**

`scope` is used to describe the scope of the impact of commit, such as sns, lang, share.

`scope` is placed after `type` and within parenthesis (`()`).

**(3)subject**

`subject` is a short description of the commit purpose, not more than 50 characters.

> - starts with a verb and uses the first person present, such as change, not changed or changes
- The first letter is lowercase
- End without a period (.)

---
See #119 `refactor(sns): simplify conditional display` for example.

## 2. Body

Body is a detailed description that can be divided into multiple lines. The following is an example.

>More detailed explanatory text, if necessary. Wrap it around
72 characters or so.

>Further paragraphs come after blank lines.

>- Bullet points are okay, too
- Use a hanging indent

There are two points to note:

(1) Use the first person present, such as `change` instead of `changed` or `changes`.

(2) The motivation for the code change should be stated, as well as the comparison with the previous behavior.

## 3. Footer

The Footer section is used only in two cases.

** (1) Incompatible changes **

If the current code is incompatible with the previous version, the Footer section begins with `BREAKING CHANGE`, followed by a description of the change, along with the reason for the change and the migration method.

BREAKING CHANGE: isolate scope bindings definition has changed.

To migrate the code follow the example below:

Before:

scope: {
myAttr: 'attribute',
}

After:

scope: {
myAttr: '@',
}

The removed `inject` wasn't generally useful for directives so there should be no code using it.

** (2) Close Issue **

If the current commit is for an issue, then you can close the issue in the Footer section.

Closes #234

You can also close more than one issue at a time.

Closes #123, #245, #992.

## 4. Revert

There is also a special case that if the current commit is used to revoke a previous commit, it must begin with `revert:` followed by the commit header.

revert: feat(pencil): add 'graphiteWidth' option

This reverts commit 667ecc1654a317a13331b17617d973392f415f02.

Body part of the format is fixed, must be written as `This reverts commit <hash>.`, Where `hash` is revoked SHA identifier of the commit.

If the current commit is in the same release as the revoked commit, they will not appear in the Change log. If the two are in different releases, the current commit will appear in the Change log under the `Reverts` subtitle.
102 changes: 102 additions & 0 deletions CONTRIBUTING.zh-cn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@


# Commit message format

*其他语言版本: [English](CONTRIBUTING.md), [简体中文](CONTRIBUTING.zh-cn.md).*

## 1. Title (Header)

**(1)type**

`type` 用于说明 commit 的类别,只允许使用下面 7 个标识。

>- feat: New feature 新功能
- fix: Fix bug 修补 bug
- docs: Documentation 文档
- style: Format 格式(不影响代码运行的变动)
- refactor: Refactor 重构(即不是新增功能,也不是修改 bug 的代码变动)
- test: Test 增加测试
- chore: 构建过程或辅助工具的变动

**(2)scope**

`scope` 用于说明 commit 影响的范围,比如 sns,lang,share。

`scope` 紧接 `type` 置于 `()` 之内。

**(3)subject**

`subject` 是 commit 目的的简短描述,不超过 50 个字符。

>- 以动词开头,使用第一人称现在时,比如change,而不是changed或changes
- 第一个字母小写
- 结尾不加句号(.)

---
Title 可参考 #119 `refactor(sns): simplify conditional display`

## 2. Body

Body 部分是对本次 commit 的详细描述,可以分成多行。下面是一个范例。

>More detailed explanatory text, if necessary. Wrap it to
about 72 characters or so.

>Further paragraphs come after blank lines.

>- Bullet points are okay, too
- Use a hanging indent

有两个注意点:

(1)使用第一人称现在时,比如使用 `change` 而不是 `changed` 或 `changes`。

(2)应该说明代码变动的动机,以及与以前行为的对比。

## 3. Footer

Footer 部分只用于两种情况。

**(1)不兼容变动**

如果当前代码与上一个版本不兼容,则 Footer 部分以 `BREAKING CHANGE` 开头,后面是对变动的描述、以及变动理由和迁移方法。

BREAKING CHANGE: isolate scope bindings definition has changed.

To migrate the code follow the example below:

Before:

scope: {
myAttr: 'attribute',
}

After:

scope: {
myAttr: '@',
}

The removed `inject` wasn't generally useful for directives so there should be no code using it.

**(2)关闭 Issue**

如果当前 commit 针对某个 issue,那么可以在 Footer 部分关闭这个 issue 。

Closes #234

也可以一次关闭多个 issue 。

Closes #123, #245, #992

## 4. Revert

还有一种特殊情况,如果当前 commit 用于撤销以前的 commit,则必须以 `revert:` 开头,后面跟着被撤销 Commit 的 Header。

revert: feat(pencil): add 'graphiteWidth' option

This reverts commit 667ecc1654a317a13331b17617d973392f415f02.

Body 部分的格式是固定的,必须写成 `This reverts commit <hash>.`,其中的 `hash` 是被撤销 commit 的 SHA 标识符。

如果当前 commit 与被撤销的 commit,在同一个发布(release)里面,那么它们都不会出现在 Change log 里面。如果两者在不同的发布,那么当前 commit,会出现在 Change log 的 `Reverts` 小标题下面。
103 changes: 72 additions & 31 deletions _config.yml → _config.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,16 @@ uiux:
hyperlink_color: "#00838F"
button_color: "#757575"
android_chrome_color: "#0097A7"
nprogress_color: "#FF4081"
nprogress_buffer: "800"
buffer: "800"

# JS Effect Switches
js_effect:
fade: true
smoothscroll: false

# Reading experience
# markdown available value:
# Material | Github | Plain
reading:
markdown: Github
entry_excerpt: 80
code_highlight: solarized-white

# Thumbnail Settings
thumbnail:
Expand All @@ -72,12 +67,29 @@ img:
daily_pic: "/img/daily_pic.png"
sidebar_header: "/img/sidebar_header.png"
footerico: "/img/footer/footer_ico-"
#upyun_logo: "/img/upyun_logo.png"
random_thumbnail: "/img/random/material-"
footer_image:
#upyun_logo:
#link: "https://www.upyun.com/"
#src: "/img/upyun_logo.png"

# Custom Fonts
fonts: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif

# Pace Settings
# Pace is automatic page load progress bar
# You can find demos on http://github.hubspot.com/pace/docs/welcome
# Warning: Line color mustn't delete or not define!
# style available values:
# barber-shop, big-counter, bounce, center-atom, center-circle, center-radar, center-simple,
# corner-indicator, fill-left, fill-left-nocolor, flat-top, loading-bar, macosx
# Or you can use your own style,just set the style value to "custom",
# and put your own css style to source/css/pace/custom.css
# document can be find on:
pace:
style:
color: "#29d"

# ---------------------------------------------------------------
# Menu Settings
# ---------------------------------------------------------------
Expand All @@ -88,14 +100,14 @@ sns:
facebook: "https://www.facebook.com/facebook"
twitter: "https://twitter.com/twitter"
googleplus: "https://www.google.com/"
weibo:
instagram:
tumblr:
github:
linkedin:
zhihu:
bilibili:
telegram:
weibo:
instagram:
tumblr:
github:
linkedin:
zhihu:
bilibili:
telegram:

# SNS Share Switch
sns_share:
Expand All @@ -107,24 +119,48 @@ sns_share:
qq: false
telegram: false

# Sidebar User Dropdown
dropdown:
Email Me:
link: "#"
icon: email

# Sidebar Categories Switch
sidebar_categories: false

# Pages Menu
pages:
#About:
#link: "/about"
#icon: person
# Sidebar Customize
sidebar:
dropdown:
Email Me:
link: "#"
icon: email
homepage:
use: true
icon: home
divider: false
archives:
use: true
icon: inbox
divider: false
categories:
use: false
icon: chrome_reader_mode
divider: false
pages:
#About:
#link: "/about"
#icon: person
#divider: false
article_num:
use: false
divider: false
footer:
divider: true
theme: true
support: false
feedback: false
material: false

# Card Elevation Level
card_elevation: 2

# Qrcode for redirect at other device
qrcode: false

# Support Pin posts on the top of the list
topPost: false

# ---------------------------------------------------------------
# Integrated Services
# ---------------------------------------------------------------
Expand All @@ -145,11 +181,16 @@ search:
use: google
swiftype_key:

# Analytics Systems
analytics:
baidu_id:
google_id:

# Leancloud Views
leancloud:
enable: false
app_id: #你的app_id
app_key: #你的app_key
app_id: #你的 app_id
app_key: #你的 app_key
av_core_mini: "https://cdn1.lncld.net/static/js/av-core-mini-0.6.1.js"

# Busuanzi 不蒜子 Views
Expand Down
6 changes: 3 additions & 3 deletions layout/_partial/Isolation-post_entry.ejs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="post_entry-module mdl-card mdl-cell mdl-cell--12-col fade out">
<div class="post_entry-module mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> mdl-cell mdl-cell--12-col fade out">
<!-- Post_entry Header -->
<% if(post.thumbnail == undefined) { %>
<% if(!post.thumbnail) { %>
<!-- Post Header Info -->
<div class="post_entry-header_info without-thumbnail">
<!-- Author Avatar & Name -->
Expand Down Expand Up @@ -28,7 +28,7 @@
<div class="post_entry-content mdl-color-text--grey-600 mdl-card__supporting-text">
<!-- Post Title -->
<p class="post_entry-title">
<a href="<%= url_for(post.path) %>"><%= post.title %></a>
<a href="<%= url_for(post.path) %>"><% if(pin) { %><span>[Top]</span><% } %><%= post.title %></a>
</p>

<!-- Post Excerpt -->
Expand Down
Loading