Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
在其基础上做了如下修改:
1. index.html首页中显示分类文章而不是标签;
2. 修改左侧『Category』栏的padding和font size(否则三个汉字就要挤到第二行了);
3. 在config文件中增加全局变量,比如url_about,其它布局文件通过{{site.url_about}} 方式引用,方便继承这个项目的人修改;
4. 在About页面中增加 SF和DouBan 超链接图标;
  • Loading branch information
li2 committed Jan 24, 2016
1 parent cdd7b3a commit e3d3aed
Show file tree
Hide file tree
Showing 108 changed files with 190 additions and 3,141 deletions.
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
painterlin.com
li2.me
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014 Anya Lin - Released under The MIT License.
Copyright (c) 2010~2016 WeiYi Li - Released under The MIT License.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
button属性修改在bootstrap.css里面
button显示修改在-include/footer.html和base.js里面


116 changes: 92 additions & 24 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,39 @@
permalink: /:year/:month/:day/:title.html
paginate: 10
markdown: redcarpet
# Owner/Author information
author:
name: WeiYi Li
avatar: /assets/img/avatar.png
email: weiyi.just2@gmail.com
# Social networking links used in footer. Update and remove as you like.
github: https://github.com/li2/
segmentfault: http://segmentfault.com/u/li2
stackoverflow: http://stackoverflow.com/users/2722270/li2
weibo: http://weibo.com/liweiyi1989
douban: http://www.douban.com/people/liweiyi
music: http://music.163.com/#/user/home?id=9643773

# 作者信息
author:
name: Anya Lin
email: lay.1010@hotmail.com
link: http://painterlin.com
weibo: http://weibo.com/orangeissweet
github: http://github.com/lay1010
music: http://site.douban.com/linanya
linkedin: https://www.linkedin.com/pub/anya-lin/81/91/232

# 站点信息
title: 林安亚的博客
description: My personal blog
url: http://painterlin.com
rss_url: /pages/atom.xml
title: li2的博客
description: My personal blog
url: http://li2.me
#url: http://127.0.0.1:4000 # debug
production_url: http://li2.me # production_url是sitemap生成的url,方便百度谷歌收录.


# url_tags必须和tags.md中的permalink定义相同,这样定义的原因是不希望permalink中包含文件类型后缀。
# 或者tags.md中不定义permalink,这里直接引用tags.md的在目录中的绝对地址。
# 其它几个url也需要遵循这个原则。
#
url_rss: /pages/atom.xml
url_about: /pages/about.html
url_archives: /pages/archive.html
url_atom: /pages/atom.html

# gavatar头像及Favicon
gavatar: /public/img/deer3.png
favicon: /public/img/deer3.png
favicon: /assets/img/favicon.ico
gavatar: /assets/img/avatar.png



# google analytics 设置
ga:
Expand All @@ -29,19 +42,74 @@ ga:

# disqus 设置
disqus:
shortname: painterlin
shortname: li2


# 主题设置,自动激活某个分类
active: Android

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

# 首页除了最新文章外显示分类
cates:
- Optimization
- LaTeX
- Android
- 工具


# 中文本地化
locals:
tags: 标签
about: 关于
newest: 最新文章
archive: 归档
archive: 归档


# Background image to be tiled on all pages
background:


# https://github.com/mojombo/jekyll/wiki/Permalinks
permalink: /:year/:month/:title.html
relative_permalinks: false


# Amount of newest post to show on home page
paginate: 8
paginate_path: "/page:num"


# http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
timezone: Asia/Shanghai
future: true


# markdown设置
# redcarpet extensions 含义参考 https://github.com/vmg/redcarpet
# 选择它的主要原因是,支持```language```语法,用来标记代码块,不需要缩进4个空格。
# 另外还支持脚注、文本高亮、删除线等扩展的markdown语法,
# 需要加入extensions列表才能开启或关闭相应功能。
#
# 表格语法需要特别注意 :-: 中间若有空格,可能不会解析。
# no_intra_emphasis: do not parse emphasis inside of words 不解析单词间的下划线
# hard_wrap: newlines
#
# 其它可选的markdown: rdiscount, kramdown,
#
markdown: redcarpet
redcarpet:
extensions: ["no_intra_emphasis", "fenced_code_blocks", "quote", "highlight", "tables", "footnotes", "hard_wrap"]
highlighter: pygments


# Analytics and webmaster tools stuff goes here
google_analytics:
google_verify:
# https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
bing_verify:


include: []
exclude: ["README.md"]


# For jekyll-3.0
gems: [jekyll-paginate]
14 changes: 5 additions & 9 deletions _includes/navside.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@
<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>
<li><a class="pjaxlink" href="/pages/archive.html">{{ site.locals.archive }}</a></li>
<li><a class="pjaxlink" href="/pages/about.html">{{ site.locals.about }}</a></li>
<!-- <li><a href="#tags" data-toggle="tab"><i class="fa fa-tags fa-lg"></i></a></li>
<li><a class="pjaxlink" href="/pages/archive.html"><i class="fa fa-archive fa-lg"></i></a></li>
<li><a class="pjaxlink" href="/pages/about.html"><i class="fa fa-user fa-lg"></i></a></li>
这是原来现实汉字的代码,我改为了图标 -->
<li><a class="pjaxlink" href="{{ site.url_archives }}">{{ site.locals.archive }}</a></li>
<li><a class="pjaxlink" href="{{ site.url_about }}">{{ site.locals.about }}</a></li>
</ul>
<div class="aside1_bottom">
<table class="table table-condensed">
<tr>
<td><a href="/pages/atom.xml" target="_blank"><i class="fa fa-rss fa-lg" style="color:#fff;"></i></a></td>
<td><a href="{{ site.url_atom }}" target="_blank"><i class="fa fa-rss fa-lg" style="color:#fff;"></i></a></td>
<td><a href="mailto:{{ site.author.email }}"><i class="fa fa-envelope-o fa-lg" style="color:#fff;"></i></a></td>
</tr>
</table>
Expand Down Expand Up @@ -64,4 +60,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.

Loading

0 comments on commit e3d3aed

Please sign in to comment.