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.

Sign up for GitHub

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

[pull] master from dongyuanxin:master #1

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

[pull] master from dongyuanxin:master #1

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
46aaf58
hotfix: check if theme.footer typeof Array
dongyuanxin Apr 13, 2019
15a3a7e
hotfix: check if theme.reward typeof Array
dongyuanxin Apr 13, 2019
6c145d7
change: reg pattern for http && https
dongyuanxin Apr 13, 2019
0c69b74
publish: v2.6.0
dongyuanxin Apr 13, 2019
a88bd51
hotfix wrong passage copywriting
dongyuanxin May 20, 2019
0eeaa46
change(header.scss): add border-bottom, vertical center style
dongyuanxin Apr 13, 2019
6826f30
add personal cdn configuration
dongyuanxin May 20, 2019
bc6f16a
move 中文介绍 to docs/
dongyuanxin May 20, 2019
bdc4896
add 常见问题.md
dongyuanxin May 20, 2019
09af1a2
Merge branch 'develop'
dongyuanxin May 20, 2019
f04269b
add baidu search, bing search supports
dongyuanxin May 20, 2019
79dcd56
Merge branch 'develop'
dongyuanxin May 20, 2019
63b3416
add 中文文档.md
dongyuanxin May 20, 2019
94ae3cc
add checks on categories and tags
chirsz-ever Aug 13, 2019
15dd9be
add a check on categories
chirsz-ever Aug 13, 2019
4de6904
add page.ejs
chirsz-ever Aug 13, 2019
0245edf
Merge pull request #32 from chirsz-ever/fix-page
dongyuanxin Sep 15, 2019
ea62397
fix: long link not warpping in copyright
paulzhn Feb 18, 2020
7775994
Merge pull request #35 from paulzhn/master
dongyuanxin Feb 19, 2020
3c4db70
Update 中文文档.md
Aunger-ops Mar 7, 2020
b293de4
Merge pull request #42 from Aunger-ops/patch-1
dongyuanxin Mar 31, 2020
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
11 changes: 11 additions & 0 deletions layout/page.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<% if(page.type === 'tags') { %>
<%- partial('tags') %>
<% } else if(page.type === 'categories') { %>
<%- partial('categories') %>
<% } else if(page.type === 'about') { %>
<%- partial('about') %>
<% } else if(page.type === 'friends') { %>
<%- partial('friends') %>
<% } else { %>
<%- partial('passage') %>
<% } %>
4 changes: 2 additions & 2 deletions layout/passage.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span>
<i class="fa fa-calendar"></i><%- page.date.format("YYYY-MM-DD") %>
</span>
<% if(page.categories.length > 0) { %>
<% if(page.categories && page.categories.data && page.categories.length > 0) { %>
<span>
| <a href="<%- url_for(page.categories.data[0].path) %>"><i class="fa fa-bookmark"></i><%- page.categories.data[0].name %></a>
</span>
Expand Down Expand Up @@ -44,7 +44,7 @@
</div>
</aside>
<% } %>
<% if(page.tags.length > 0) { %>
<% if(page.tags && page.tags.length > 0) { %>
<div class="passage-tags">
<% for(let tag of page.tags.data) { %>
<a href="<%- url_for(tag.path) %>"><i class="fa fa-tags"></i><%- tag.name %></a>
Expand Down