Skip to content

Master #12

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

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
painterlin.com
xuxintao.com
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
button属性修改在bootstrap.css里面
button显示修改在-include/footer.html和base.js里面
forked from lay1010/lay1010.github.io
thanks you

30 changes: 14 additions & 16 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,42 @@ markdown: redcarpet

# 作者信息
author:
name: Anya Lin
email: [email protected]
link: http://painterlin.com
weibo: http://weibo.com/orangeissweet
github: http://github.com/lay1010
music: http://site.douban.com/linanya
name: 许新涛
email: [email protected]
github: http://github.com/xuxintao
music: http://music.163.com/#/user/home?id=29737326
linkedin: https://www.linkedin.com/pub/anya-lin/81/91/232

# 站点信息
title: 林安亚的博客
title: 许新涛的博客
description: My personal blog
url: http://painterlin.com
url: http://xuxintao.com
rss_url: /pages/atom.xml

# gavatar头像及Favicon
gavatar: /public/img/deer3.png
favicon: /public/img/deer3.png
gavatar: /public/img/me.jpg
favicon: /public/img/tao.jpg

# google analytics 设置
ga:
id: UA-54262064-1
url: painterlin.com
url: xuxintao.com

# disqus 设置
disqus:
shortname: painterlin
shortname: xuxintao

# 主题设置,自动激活某个标签
active: 读书
active: 编程

# 首页除了最新文章外显示分类
cates:
- Optimization
- LaTeX
- iOS
- 书评

# 中文本地化
locals:
tags: 标签
about: 关于
newest: 最新文章
archive: 归档
archive: 归档
2 changes: 0 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
<script src="/public/js/jquery.pjax.js"></script>
<script src="/public/js/prettify/prettify.js"></script>
<script src="/public/js/base.js"></script>
<!--
<script src="/public/js/jquery.scrollUp.js"></script>
-->
<script>
$('a[href="#{{ site.active }}"]').tab('show');
</script>
Expand Down
4 changes: 2 additions & 2 deletions _includes/navside.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<a class="pjaxlink" href="/"><img src="{{ site.gavatar }}" class="img-ronuded avatar" style="border-width:0px; border-color:#000"></a>
<br><br><br><br>
<ul class="nav nav-pills nav-stacked">
{% for category in site.categories %} <!-- 这里是aside1的读书、生活、科研、技术、绘画-->
{% for category in site.categories %} <!-- 这里是aside1的读书、生活、想法、技术、绘画-->
<li><a href="#{{ category | first }}" data-toggle="tab">{{ category[0] }}</a></li>
{% endfor %}
<li><a href="#tags" data-toggle="tab">{{ site.locals.tags }}</a></li>
Expand Down Expand Up @@ -64,4 +64,4 @@ <h4 class="panel-title">
</div>
</div>
</div>
</div>
</div>
30 changes: 0 additions & 30 deletions _posts/厨房/2013-01-28-Mung-Bean-Soup.md

This file was deleted.

31 changes: 0 additions & 31 deletions _posts/厨房/2013-01-29-Fried-Lobster.md

This file was deleted.

34 changes: 0 additions & 34 deletions _posts/厨房/2013-01-30-Fish.md

This file was deleted.

28 changes: 0 additions & 28 deletions _posts/厨房/2014-08-16-Pig-Trotter.md

This file was deleted.

33 changes: 0 additions & 33 deletions _posts/厨房/2014-10-29-Fried-Egg-Toast.md

This file was deleted.

39 changes: 0 additions & 39 deletions _posts/厨房/2014-11-02-Steak.md

This file was deleted.

9 changes: 9 additions & 0 deletions _posts/打卡/2015-10-26-Do-with-your-guitar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: post
title:
category: 打卡
tags:
keywords:
description:
---
2016年1月1日,早上八点
Loading