Skip to content

Commit 37ba928

Browse files
jiangtjjiangtj
committed
Merge branch 'master' into toc-max-depth
2 parents a9aa98e + 979bc69 commit 37ba928

File tree

19 files changed

+209
-68
lines changed

19 files changed

+209
-68
lines changed

‎.github/stale.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ exemptLabels:
1212
- pending-reply
1313
- feature-request
1414
- enhancement
15-
- question
1615
- documentation
17-
- backlog
1816
# Label to use when marking as stale
1917
staleLabel: stale
2018
# Comment to post when marking as stale. Set to `false` to disable

‎LICENSE.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# <div align="center">«NexT» — Elegant and powerful theme for Hexo.</div>
1+
# <div align="center">«NexT» – Elegant and powerful theme for Hexo.</div>
22

33
<p align="center">Copyright © 2017 «<a href="https://github.com/theme-next/hexo-theme-next">NexT</a>».</p>
44

@@ -29,9 +29,9 @@ along with this program; if not, see: https://www.gnu.org/licenses/agpl.txt
2929
except of third party libraries ('[source/lib/*](source/lib)') and '\*custom.\*' files,
3030
will mean this part owned by «NexT» in accord with terms in this file.
3131

32-
* c) A covered work must retain theme info link to the «NexT» repository
33-
(https://github.com/theme-next/hexo-theme-next) in footer section
34-
of every website created, modified or manipulated by using «NexT».
32+
* c) A covered work must retain «NexT» official website link
33+
(https://theme-next.org) in footer section of every website created,
34+
modified or manipulated by using «NexT».
3535
«NexT» theme configuration must be:
3636
```yml
3737
footer:
@@ -53,9 +53,9 @@ These activities include:
5353
3. Priority support for implement all possible features to «NexT».
5454
5555
For more information, please contact «NexT» Organization at this
56-
address: sales@theme-next.org
56+
address: support@theme-next.org
5757
58-
<p align="center">This license also available in <a href="docs/LICENSE">text format</a>.</p>
58+
<p align="center">This license also available in <a href="docs/LICENSE.txt">text format</a>.</p>
5959
6060
[AUTHORS]: docs/AUTHORS.md
6161
[AGPL3]: docs/AGPL3.md

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<a href="https://www.codacy.com/app/theme-next/hexo-theme-next?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=theme-next/hexo-theme-next&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/72f7fe7609c2438a92069f448e5a341a" title="Project Grade"></a>
1111
<a href="https://travis-ci.org/theme-next/hexo-theme-next?branch=master"><img src="https://travis-ci.org/theme-next/hexo-theme-next.svg?branch=master" title="Travis CI [Linux]"></a>
1212
<a href="https://crwd.in/theme-next"><img src="https://d322cqt584bo4o.cloudfront.net/theme-next/localized.svg" title="Add or improve translation in few seconds!"></a>
13+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/open/theme-next/hexo-theme-next.svg" title="Percentage of issues still open"></a>
14+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/resolution/theme-next/hexo-theme-next.svg" title="Average time to resolve an issue"></a>
1315
<a href="https://github.com/theme-next/hexo-theme-next/releases"><img src="https://badge.fury.io/gh/theme-next%2Fhexo-theme-next.svg"></a>
1416
<a href="http://hexo.io"><img src="https://img.shields.io/badge/hexo-%3E%3D%203.5.0-blue.svg"></a>
1517
<a href="https://github.com/theme-next/hexo-theme-next/blob/master/LICENSE.md"><img src="https://img.shields.io/badge/license-%20AGPL-blue.svg"></a>
@@ -145,4 +147,4 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
145147
| [<img src="https://avatars2.githubusercontent.com/u/6104460?v=4" width="100px;"/><br /><sub><b>Fisher Chang</b></sub>](http://bluefisher.github.io)<br />[🐛](https://github.com/theme-next/hexo-theme-next/issues?q=author%3ABlueFisher "Bug reports") [💻](https://github.com/theme-next/hexo-theme-next/commits?author=BlueFisher "Code") [📖](https://github.com/theme-next/hexo-theme-next/commits?author=BlueFisher "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/4521477?v=4" width="100px;"/><br /><sub><b>Chanson Shen</b></sub>](http://chansonshen.com/)<br />[🐛](https://github.com/theme-next/hexo-theme-next/issues?q=author%3Ashenchsh "Bug reports") [💻](https://github.com/theme-next/hexo-theme-next/commits?author=shenchsh "Code") [📖](https://github.com/theme-next/hexo-theme-next/commits?author=shenchsh "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/842383?v=4" width="100px;"/><br /><sub><b>Thomas Yang</b></sub>](http://ywjno.com)<br />[🐛](https://github.com/theme-next/hexo-theme-next/issues?q=author%3Aywjno "Bug reports") [💻](https://github.com/theme-next/hexo-theme-next/commits?author=ywjno "Code") [📖](https://github.com/theme-next/hexo-theme-next/commits?author=ywjno "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/8149261?v=4" width="100px;"/><br /><sub><b>Legendary Nacar</b></sub>](http://legendarynacar.github.io)<br />[🌍](#translation-legendarynacar "Translation") | [<img src="https://avatars0.githubusercontent.com/u/19174234?v=4" width="100px;"/><br /><sub><b>rikusen0335</b></sub>](https://github.com/Rikusen0335)<br />[🌍](#translation-Rikusen0335 "Translation") |
146148
<!-- ALL-CONTRIBUTORS-LIST:END -->
147149

148-
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
150+
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

‎_config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ mobile_layout_economy: false
368368
android_chrome_color: "#222"
369369

370370
# Custom Logo.
371-
# !!Only available for Default Scheme currently.
371+
# Do not support Scheme Mist currently.
372372
# Options:
373373
# enabled: [true/false] - Replace with specific image
374374
# image: url-of-image - Images's url
@@ -1011,7 +1011,7 @@ vendors:
10111011

10121012
# Internal version: 3.3.0
10131013
# See: https://github.com/ethantw/Han
1014-
Han:
1014+
han:
10151015

10161016
# Internal version: 3.3.0
10171017
# See: https://github.com/vinta/pangu.js

docs/LICENSE renamed to docs/LICENSE.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
«NexT» — Elegant and powerful theme for Hexo.
1+
«NexT» – Elegant and powerful theme for Hexo.
22

33
Copyright © 2017 «NexT» (github.com/theme-next/hexo-theme-next).
44

@@ -29,9 +29,9 @@ along with this program; if not, see: https://www.gnu.org/licenses/agpl.txt
2929
except of third party libraries ('source/lib/*') and '*custom.*' files,
3030
will mean this part owned by «NexT» in accord with terms in this file.
3131

32-
c) A covered work must retain theme info link to the «NexT» repository
33-
(https://github.com/theme-next/hexo-theme-next) in footer section
34-
of every website created, modified or manipulated by using «NexT».
32+
* c) A covered work must retain «NexT» official website link
33+
(https://theme-next.org) in footer section of every website created,
34+
modified or manipulated by using «NexT».
3535
«NexT» theme configuration must be:
3636
```
3737
footer:
@@ -53,4 +53,4 @@ These activities include:
5353
3. Priority support for implement all possible features to «NexT».
5454

5555
For more information, please contact «NexT» Organization at this
56-
address: sales@theme-next.org
56+
address: support@theme-next.org

‎docs/ru/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
<p align="center">«NexT» — элегантная высококачественная тема под <a href="http://hexo.io">Hexo</a>. Сделана с нуля, с любовью.</p>
88

99
<p align="center">
10-
<a href="https://www.codacy.com/app/theme-next/hexo-theme-next?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=theme-next/hexo-theme-next&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/72f7fe7609c2438a92069f448e5a341a" title="Project Grade"></a>
10+
<a href="https://www.codacy.com/app/theme-next/hexo-theme-next?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=theme-next/hexo-theme-next&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/72f7fe7609c2438a92069f448e5a341a" title="Оценка проекта"></a>
1111
<a href="https://travis-ci.org/theme-next/hexo-theme-next?branch=master"><img src="https://travis-ci.org/theme-next/hexo-theme-next.svg?branch=master" title="Travis CI [Linux]"></a>
1212
<a href="https://crwd.in/theme-next"><img src="https://d322cqt584bo4o.cloudfront.net/theme-next/localized.svg" title="Добавить или улучшить перевод за несколько секунд!"></a>
13+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/open/theme-next/hexo-theme-next.svg" title="Процент нерешённых проблем"></a>
14+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/resolution/theme-next/hexo-theme-next.svg" title="Среднее время решения проблемы"></a>
1315
<a href="https://github.com/theme-next/hexo-theme-next/releases"><img src="https://badge.fury.io/gh/theme-next%2Fhexo-theme-next.svg"></a>
1416
<a href="http://hexo.io"><img src="https://img.shields.io/badge/hexo-%3E%3D%203.5.0-blue.svg"></a>
1517
<a href="https://github.com/theme-next/hexo-theme-next/blob/master/LICENSE.md"><img src="https://img.shields.io/badge/license-%20AGPL-blue.svg"></a>

‎docs/zh-CN/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<a href="https://www.codacy.com/app/theme-next/hexo-theme-next?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=theme-next/hexo-theme-next&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/72f7fe7609c2438a92069f448e5a341a" title="Project Grade"></a>
1111
<a href="https://travis-ci.org/theme-next/hexo-theme-next?branch=master"><img src="https://travis-ci.org/theme-next/hexo-theme-next.svg?branch=master" title="Travis CI [Linux]"></a>
1212
<a href="https://crwd.in/theme-next"><img src="https://d322cqt584bo4o.cloudfront.net/theme-next/localized.svg" title="请花几秒钟来添加或修正翻译！"></a>
13+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/open/theme-next/hexo-theme-next.svg" title="Percentage of issues still open"></a>
14+
<a href="https://github.com/theme-next/hexo-theme-next/issues"><img src="http://isitmaintained.com/badge/resolution/theme-next/hexo-theme-next.svg" title="Average time to resolve an issue"></a>
1315
<a href="https://github.com/theme-next/hexo-theme-next/releases"><img src="https://badge.fury.io/gh/theme-next%2Fhexo-theme-next.svg"></a>
1416
<a href="http://hexo.io"><img src="https://img.shields.io/badge/hexo-%3E%3D%203.5.0-blue.svg"></a>
1517
<a href="https://github.com/theme-next/hexo-theme-next/blob/master/LICENSE.md"><img src="https://img.shields.io/badge/license-%20AGPL-blue.svg"></a>

‎languages/uk.yml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
---
2+
title:
3+
archive: Архів
4+
category: Категорія
5+
tag: Тег
6+
schedule: Календар
7+
menu:
8+
home: Головна
9+
archives: Архів
10+
categories: Категорії
11+
tags: Теги
12+
about: Про сайт
13+
search: Пошук
14+
schedule: Календар
15+
sitemap: Карта сайту
16+
commonweal: Сторінка 404
17+
sidebar:
18+
overview: Огляд
19+
toc: Зміст
20+
post:
21+
posted: Опубліковано
22+
edited: Змінено
23+
created: Створено
24+
modified: Змінено
25+
edit: Редагувати запис
26+
in: в категорії
27+
more: more
28+
read_more: Читати повністю
29+
untitled: Без імені
30+
sticky: Посилання
31+
toc_empty: Цей запис без змісту
32+
views: Переглядів
33+
comments_count: Коментарів
34+
related_posts: Схожі записи
35+
copy_button: Скопіювати
36+
copy_success: Скопійовано!
37+
copy_failure: Помилка копіювання!
38+
copyright:
39+
author: Автор запису
40+
link: Посилання на запис
41+
license_title: Інформація про авторські права
42+
license_content: "Всі записи на цьому сайті захищені ліцензією %s, якщо не вказано додатково."
43+
page:
44+
totally: Всього
45+
tags: теги
46+
footer:
47+
powered: "Генератор — %s"
48+
theme: Тема
49+
total_views: Всього переглядів
50+
total_visitors: Всього відвідувачів
51+
counter:
52+
tag_cloud:
53+
zero: Немає тегів.
54+
one: 1 тег.
55+
other: "%d тегів всього."
56+
categories:
57+
zero: Немає категорій.
58+
one: 1 категорія.
59+
other: "%d категорій всього."
60+
archive_posts:
61+
zero: Немає записів.
62+
one: 1 запис.
63+
other: "%d записів всього."
64+
state:
65+
posts: Архів
66+
pages: Сторінки
67+
tags: Теги
68+
categories: Категорії
69+
search:
70+
placeholder: Пошук...
71+
cheers:
72+
um: Ем..
73+
ok: ОК
74+
nice: Не погано
75+
good: Добре
76+
great: Чудово
77+
excellent: Прекрасно
78+
keep_on: Продовжую писати.
79+
symbol:
80+
comma: ", "
81+
period: ". "
82+
colon: ": "
83+
reward:
84+
donate: Донат
85+
wechatpay: WeChat Pay
86+
alipay: Alipay
87+
bitcoin: Bitcoin
88+
gitmentbutton: Відкрити Gitment коментарі
89+
accessibility:
90+
nav_toggle: Показати/приховати меню
91+
prev_page: Попередня сторінка
92+
next_page: Наступна сторінка
93+
symbols_count_time:
94+
count: К-сть символів в статті
95+
count_total: Загальна к-сть символів
96+
time: Час читання
97+
time_total: Загальний час читання
98+
time_minutes: хв.

‎layout/_partials/head/head.swig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
{% if theme.han %}
3131
{% set Han_uri = url_for(theme.vendors._internal + '/Han/dist/han.min.css?v=3.3') %}
32-
{% if theme.vendors.Han %}
33-
{% set Han_uri = theme.vendors.Han %}
32+
{% if theme.vendors.han %}
33+
{% set Han_uri = theme.vendors.han %}
3434
{% endif %}
3535
<link rel="stylesheet" media="all" href="{{ Han_uri }}">
3636
{% endif %}

‎layout/_partials/header/brand.swig‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<div class="site-brand-wrapper">
2-
<div class="site-meta {% if theme.custom_logo.enabled %}custom-logo{% endif %}">
3-
{% if theme.custom_logo.image and theme.scheme === 'Muse' %}
2+
<div class="site-meta{% if theme.custom_logo.enabled %} custom-logo{% endif %}">
3+
{% if theme.custom_logo.enabled and theme.custom_logo.image and theme.scheme === 'Muse' %}
44
<div class="site-meta-headline">
55
<a>
6-
<img class="custom-logo-image" src="{{ theme.custom_logo.image }}"
7-
alt="{{ title }}"/>
6+
<img class="custom-logo-image" src="{{ theme.custom_logo.image }}" alt="{{ title }}"/>
87
</a>
98
</div>
109
{% endif %}
@@ -23,6 +22,11 @@
2322
<p class="site-subtitle">{{ subtitle }}</p>
2423
{% endif %}
2524
{% endif %}
25+
{% if theme.custom_logo.enabled and theme.custom_logo.image and (theme.scheme === 'Gemini' or theme.scheme === 'Pisces') %}
26+
<a>
27+
<img class="custom-logo-image" src="{{ theme.custom_logo.image }}" alt="{{ title }}"/>
28+
</a>
29+
{% endif %}
2630
</div>
2731

2832
<div class="site-nav-toggle">

0 commit comments

Comments
 (0)