Skip to content

Commit

Permalink
Just another push
Browse files Browse the repository at this point in the history
  • Loading branch information
SimpleJian committed Nov 22, 2014
1 parent 6ae07c1 commit 9eee2e4
Show file tree
Hide file tree
Showing 93 changed files with 5,331 additions and 22 deletions.
11 changes: 5 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
## Source: https://github.com/hexojs/hexo/

# Site
title: Just follow your heart
title: Lijian's Site
subtitle: Everything is possible if you have the real passion to what you do
description: Just another blog
description: My Blog for share and record some interesting things.
author: Lijian
email: [email protected]
language: zh-Hans
Expand Down Expand Up @@ -75,8 +75,8 @@ time_format: H:mm:ss
per_page: 10
pagination_dir: page

# Disqus
disqus_shortname:
# Duoshuo
duoshuo_shortname: lingdian618

# Extensions
## Plugins: https://github.com/hexojs/hexo/wiki/Plugins
Expand All @@ -85,8 +85,7 @@ plugins:
- hexo-qiniu
- hexo-generator-feed
- hexo-math
# theme: hexo-theme-landscape
theme: modified-pacman
theme: landscape
exclude_generator:

# Deployment
Expand Down
4 changes: 0 additions & 4 deletions source/About/index.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions source/_posts/kkt.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ date: 2014/07/05
categories:
- 学习笔记
tags:
- Numerical Optimization
- Nonlinear Optimization
- math
- optimization
- KKT
---

Expand Down
3 changes: 1 addition & 2 deletions source/_posts/polyDFT.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ date: 2013/10/21
categories:
- 学习笔记
tags:
- Digit image process
- DIP
- DFT
- Introduction to algorithm
---


Expand Down
3 changes: 3 additions & 0 deletions source/about/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
title: about
date: 2014-11-22 20:50:07
---
4 changes: 0 additions & 4 deletions source/photos/test.md

This file was deleted.

1 change: 0 additions & 1 deletion themes/hexo-theme-landscape
Submodule hexo-theme-landscape deleted from 1f78c6
1 change: 0 additions & 1 deletion themes/hexo-theme-light
Submodule hexo-theme-light deleted from 65772e
1 change: 0 additions & 1 deletion themes/hexo-theme-modernist
Submodule hexo-theme-modernist deleted from eb7ba6
1 change: 1 addition & 0 deletions themes/landscape-plus
Submodule landscape-plus added at 320f2a
3 changes: 3 additions & 0 deletions themes/landscape/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
node_modules
tmp
46 changes: 46 additions & 0 deletions themes/landscape/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
module.exports = function(grunt){
grunt.initConfig({
gitclone: {
fontawesome: {
options: {
repository: 'https://github.com/FortAwesome/Font-Awesome.git',
directory: 'tmp/fontawesome'
},
},
fancybox: {
options: {
repository: 'https://github.com/fancyapps/fancyBox.git',
directory: 'tmp/fancybox'
}
}
},
copy: {
fontawesome: {
expand: true,
cwd: 'tmp/fontawesome/fonts/',
src: ['**'],
dest: 'source/css/fonts/'
},
fancybox: {
expand: true,
cwd: 'tmp/fancybox/source/',
src: ['**'],
dest: 'source/fancybox/'
}
},
_clean: {
tmp: ['tmp'],
fontawesome: ['source/css/fonts'],
fancybox: ['source/fancybox']
}
});

require('load-grunt-tasks')(grunt);

grunt.renameTask('clean', '_clean');

grunt.registerTask('fontawesome', ['gitclone:fontawesome', 'copy:fontawesome', '_clean:tmp']);
grunt.registerTask('fancybox', ['gitclone:fancybox', 'copy:fancybox', '_clean:tmp']);
grunt.registerTask('default', ['gitclone', 'copy', '_clean:tmp']);
grunt.registerTask('clean', ['_clean']);
};
7 changes: 7 additions & 0 deletions themes/landscape/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2013 Tommy Chen

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
111 changes: 111 additions & 0 deletions themes/landscape/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
# Landscape

A brand new default theme for [Hexo].

- [Preview](http://hexo.io/hexo-theme-landscape/)

## Installation

### Install

``` bash
$ git clone https://github.com/hexojs/hexo-theme-landscape.git themes/landscape
```

**Landscape requires Hexo 2.4 and above.**

### Enable

Modify `theme` setting in `_config.yml` to `landscape`.

### Update

``` bash
cd themes/landscape
git pull
```

## Configuration

``` yml
# Header
menu:
Home: /
Archives: /archives
rss: /atom.xml

# Content
excerpt_link: Read More
fancybox: true

# Sidebar
sidebar: right
widgets:
- category
- tag
- tagcloud
- archives
- recent_posts

# Miscellaneous
google_analytics:
favicon: /favicon.png
twitter:
google_plus:
```
- **menu** - Navigation menu
- **rss** - RSS link
- **excerpt_link** - "Read More" link at the bottom of excerpted articles. `false` to hide the link.
- **fancybox** - Enable [Fancybox]
- **sidebar** - Sidebar style. You can choose `left`, `right`, `bottom` or `false`.
- **widgets** - Widgets displaying in sidebar
- **google_analytics** - Google Analytics ID
- **favicon** - Favicon path
- **twitter** - Twiiter ID
- **google_plus** - Google+ ID

## Features

### Fancybox

Landscape uses [Fancybox] to showcase your photos. You can use Markdown syntax or fancybox tag plugin to add your photos.

```
![img caption](img url)

{% fancybox img_url [img_thumbnail] [img_caption] %}
```
### Sidebar
You can put your sidebar in left side, right side or bottom of your site by editing `sidebar` setting.
Landscape provides 5 built-in widgets:
- category
- tag
- tagcloud
- archives
- recent_posts
All of them are enabled by default. You can edit them in `widget` setting.
## Development
### Requirements
- [Grunt] 0.4+
- Hexo 2.4+
### Grunt tasks
- **default** - Download [Fancybox] and [Font Awesome].
- **fontawesome** - Only download [Font Awesome].
- **fancybox** - Only download [Fancybox].
- **clean** - Clean temporarily files and downloaded files.
[Hexo]: http://zespia.tw/hexo/
[Fancybox]: http://fancyapps.com/fancybox/
[Font Awesome]: http://fontawesome.io/
[Grunt]: http://gruntjs.com/
27 changes: 27 additions & 0 deletions themes/landscape/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Header
menu:
Home: /
Archives: /archives
About: /about
rss: /atom.xml

# Content
excerpt_link: Read More
fancybox: true

# Sidebar
sidebar: right
widgets:
- category
- tag
#- tagcloud
- archive
- recent_posts

# Miscellaneous
google_analytics:
favicon: /favicon.png
twitter:
google_plus:
fb_admins:
fb_app_id:
24 changes: 24 additions & 0 deletions themes/landscape/layout/_partial/after-footer.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<% if (config.disqus_shortname){ %>
<script>
var disqus_shortname = '<%= config.disqus_shortname %>';
<% if (page.permalink){ %>
var disqus_url = '<%= page.permalink %>';
<% } %>
(function(){
var dsq = document.createElement('script');
dsq.type = 'text/javascript';
dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/<% if (page.comments) { %>embed.js<% } else { %>count.js<% } %>';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<% } %>

<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>

<% if (theme.fancybox){ %>
<%- css('fancybox/jquery.fancybox') %>
<%- js('fancybox/jquery.fancybox.pack') %>
<% } %>

<%- js('js/script') %>
8 changes: 8 additions & 0 deletions themes/landscape/layout/_partial/archive-post.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<article class="archive-article archive-type-<%= post.layout %>">
<div class="archive-article-inner">
<header class="archive-article-header">
<%- partial('post/date', {class_name: 'archive-article-date', date_format: 'MMM D'}) %>
<%- partial('post/title', {class_name: 'archive-article-title'}) %>
</header>
</div>
</article>
33 changes: 33 additions & 0 deletions themes/landscape/layout/_partial/archive.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<% if (pagination == 2){ %>
<% page.posts.each(function(post){ %>
<%- partial('article', {post: post, index: true}) %>
<% }) %>
<% if (page.total > 1){ %>
<nav id="page-nav">
<%- paginator({
prev_text: '&laquo; Prev',
next_text: 'Next &raquo;'
}) %>
</nav>
<% } %>
<% } else { %>
<% var last; %>
<% page.posts.each(function(post, i){ %>
<% var year = post.date.year(); %>
<% if (last != year){ %>
<% if (last != null){ %>
</div></section>
<% } %>
<% last = year; %>
<section class="archives-wrap">
<div class="archive-year-wrap">
<a href="<%- url_for('archives/' + year) %>" class="archive-year"><%= year %></a>
</div>
<div class="archives">
<% } %>
<%- partial('archive-post', {post: post, even: i % 2 == 0}) %>
<% }) %>
<% if (page.posts.length){ %>
</div></section>
<% } %>
<% } %>
Loading

0 comments on commit 9eee2e4

Please sign in to comment.