diff --git a/_config.yml b/_config.yml index 77da8f25d..cfb33d8df 100644 --- a/_config.yml +++ b/_config.yml @@ -65,7 +65,7 @@ JB : categories_limit: 3 code_prettify: - theme: prettify + theme: doxy comments : provider : changyan diff --git a/_data/categories.yml b/_data/categories.yml index 8ff8a9e32..98b614341 100644 --- a/_data/categories.yml +++ b/_data/categories.yml @@ -158,6 +158,8 @@ - name: 模拟器 categories: - name: Qemu + - name: Unicorn + - name: Bochs - name: Javascript Emulator - name: 开发环境 categories: @@ -358,6 +360,7 @@ - name: 研发管理 - name: 质量保障 - name: 码农生活 + - name: 就业机会 - name: 项目实践 categories: @@ -389,6 +392,8 @@ - name: 泰晓沙龙 - name: 泰晓福利 - name: 泰晓资讯 + - name: 视频课程 + - name: 视频直播 - name: Linux 知识星球 - name: 关于我们 @@ -402,4 +407,3 @@ - name: Web 建站系统 categories: - name: Wordpress - - name: 视频直播 diff --git a/_data/people.yml b/_data/people.yml index 451cccf37..8a41dfe48 100644 --- a/_data/people.yml +++ b/_data/people.yml @@ -149,11 +149,13 @@ Dong Liyuan: Wu Weilin: name: Wu Weilin - nickname: william + nickname: DecJude archive: true article: true + wechat : DecJude + email: decjude@163.com github: DecJude - info: Thermal 工程师。 + info: Android/Linux 系统优化 Zhao Bin: name: Zhao Bin diff --git a/_data/tools.yml b/_data/tools.yml index 5aad054b6..b40f43c95 100644 --- a/_data/tools.yml +++ b/_data/tools.yml @@ -48,3 +48,8 @@ permalink: https://validator.w3.org/feed/ description: a free service that checks the syntax of Atom or RSS feeds. group: tools + +- title: 在线 Markdown 转换工具 + permalink: http://md.aclickall.com/ + description: 支持把 Markdown 转换为公众号支持的格式，比 Markdown Here 要友好 + group: tools diff --git a/_includes/themes/tinylab.org/default.html b/_includes/themes/tinylab.org/default.html index 84fa05bf3..396fcfec4 100644 --- a/_includes/themes/tinylab.org/default.html +++ b/_includes/themes/tinylab.org/default.html @@ -75,6 +75,14 @@ }); + + diff --git a/_includes/themes/tinylab.org/page.html b/_includes/themes/tinylab.org/page.html index 739ce40a6..af0cbd284 100644 --- a/_includes/themes/tinylab.org/page.html +++ b/_includes/themes/tinylab.org/page.html @@ -1,3 +1,18 @@ +{% if page.group != "home" %} +
+ {% assign articles = site.pages %} + {% assign condition = 'top' %} + {% assign value = true %} + {% assign style = "tiny" %} + {% include widgets/articles %} + + {% assign articles = site.posts %} + {% include widgets/articles %} + + {% assign style = null %} +
+{% endif %} +
@@ -34,6 +49,7 @@

{{ page.title }}

{% else %} {% include widgets/contact %} {% endif %} +{% include widgets/footer_ads %} {% if page.license != false %}
diff --git a/_includes/themes/tinylab.org/post.html b/_includes/themes/tinylab.org/post.html index 83fd372c7..59d567183 100644 --- a/_includes/themes/tinylab.org/post.html +++ b/_includes/themes/tinylab.org/post.html @@ -1,3 +1,15 @@ +
+ {% assign articles = site.pages %} + {% assign condition = 'top' %} + {% assign value = true %} + {% assign style = "tiny" %} + {% include widgets/articles %} + + {% assign articles = site.posts %} + {% include widgets/articles %} + {% assign style = null %} +
+
@@ -64,4 +76,6 @@

{{ page.title }}

{% include widgets/prev_next_post %} + {% include widgets/footer_ads %} +
diff --git a/_includes/themes/tinylab.org/weekly.html b/_includes/themes/tinylab.org/weekly.html index 47ab119cb..e8fd36e13 100644 --- a/_includes/themes/tinylab.org/weekly.html +++ b/_includes/themes/tinylab.org/weekly.html @@ -1,3 +1,12 @@ +
+ {% assign articles = site.posts %} + {% assign condition = 'top' %} + {% assign value = true %} + {% assign style = "tiny" %} + {% include widgets/articles %} + {% assign style = null %} +
+
@@ -19,6 +28,7 @@

{{ page.title }}

泰晓资讯，汇总一周技术趣闻与文章。
+
{% include widgets/sponsor %} diff --git a/_includes/widgets/articles b/_includes/widgets/articles index cd1e7c093..6d3d39862 100644 --- a/_includes/widgets/articles +++ b/_includes/widgets/articles @@ -13,14 +13,34 @@ {% endif %} {% if article.draft and article.draft == true %} - {% if condition != 'draft' and value != true %} + {% if condition == 'draft' and value == true %} + {% assign dummy = null %} + {% else %} {% continue %} {% endif %} {% endif %} +{% assign top_start="" %} +{% assign top_end="" %} +{% assign top_style="" %} + +{% if article.top and article.top == true %} + {% if condition == 'top' and value == true and page.title != article.title %} + {% assign top_style="" %} + {% assign top_start="[置顶] " %} + {% assign top_end="" %} + {% else %} + {% if condition != 'draft' or article.draft != true %} + {% continue %} + {% endif %} + {% endif %} +{% endif %} +
+ {% if style != "tiny" %} + {% assign article_date = nil %} {% if article.date %} {% assign article_date = article.date %} @@ -33,10 +53,14 @@ {% endif %} + {% endif %} +

- {% if article.desc %}{{ article.desc }}{% endif %}{{ article.title }} + {{ top_start }}{% if article.desc %}{{ article.desc }}{% endif %}{{ article.title }}{{ top_end }}

+ {% if style != "tiny" %} + {% if article.group %}{% assign group = article.group %}{% else %}{% assign group = "original" %}{% endif %} {% assign group_name = site.data.groups[group] %} @@ -75,6 +99,8 @@ + {% endif %} +
{% endfor %} diff --git a/_includes/widgets/author_box_sidebar b/_includes/widgets/author_box_sidebar index de452d70f..23d42b972 100644 --- a/_includes/widgets/author_box_sidebar +++ b/_includes/widgets/author_box_sidebar @@ -12,6 +12,7 @@ + {% assign author = null %} diff --git a/_includes/widgets/footer b/_includes/widgets/footer index ee6e7a701..1b58cca77 100644 --- a/_includes/widgets/footer +++ b/_includes/widgets/footer @@ -1,3 +1,4 @@ +

关注我们： {% for about in site.data.about %} diff --git a/_includes/widgets/footer_ads b/_includes/widgets/footer_ads new file mode 100644 index 000000000..004b122d9 --- /dev/null +++ b/_includes/widgets/footer_ads @@ -0,0 +1,23 @@ + +

diff --git a/_includes/widgets/home_ads b/_includes/widgets/home_ads index e69de29bb..ef3a137c9 100644 --- a/_includes/widgets/home_ads +++ b/_includes/widgets/home_ads @@ -0,0 +1 @@ +开课啦：Linux 码农 5 万月薪必修课！ diff --git a/_includes/widgets/prev_next_button b/_includes/widgets/prev_next_button index 93fc08bc6..b7ef76bb1 100644 --- a/_includes/widgets/prev_next_button +++ b/_includes/widgets/prev_next_button @@ -2,6 +2,8 @@ {% assign icon_right = "" %} {% assign visible = "" %} {% assign invisible = "class='invisible'" %} + +