Patch 1:Codeblocks self-adaption on mobile devices

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+    - "4.1"
+install:
+    npm install

LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2015 tufu9441
+
+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.

README.md

@@ -1,32 +1,129 @@
-maupassant
-==========
+# Maupassant
 
-A simple Hexo template with great performance on different devices.
+[![Build Status](https://travis-ci.org/tufu9441/maupassant-hexo.svg?branch=master)](https://travis-ci.org/tufu9441/maupassant-hexo)   [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/tufu9441/maupassant-hexo/blob/master/LICENSE)
 
-![template preview](https://ddydeg.by3302.livefilestore.com/y2p1ZgHER4eIFaEHhwaf96MvZH4_iLufEIDj7o8acDgI1GXFDtPI-eRAgvokFoR9irbz738gMmWc_N7yexG6uhB1Dcmelb0cXg8HexpiAdZ5HQ/m.png "Maupassant template preview")
+> 大道至简
 
-## Install
+[Preview](https://www.haomwei.com)｜[中文文档](https://www.haomwei.com/technology/maupassant-hexo.html)
 
-- install renderers
+A simple Hexo template with great performance on different devices, ported from a Typecho theme by [Cho](https://github.com/pagecho/maupassant/), forked and modified from [icylogic](https://github.com/icylogic/maupassant-hexo/).
+
+![template preview](http://ooo.0o0.ooo/2015/10/24/562b5be12177e.jpg
+ "Maupassant template preview")
+
+## Installation
+Install theme and renderers:
 
 ```
-git clone https://github.com/icylogic/maupassant-hexo.git themes/maupassant
+git clone https://github.com/tufu9441/maupassant-hexo.git themes/maupassant
 npm install hexo-renderer-sass --save
 npm install hexo-renderer-jade --save
 ```
 
-- Edit _config.yml in hexo root, change `theme` to `maupassant`
+Then change your `theme` setting in `_config.yml` to `maupassant`.
+
+## Configuration
+Default config:
+
+```
+fancybox: true ## If you want to use fancybox please set the value to true
+duoshuo: ## Your duoshuo_shortname, e.g. haomwei
+disqus: ## Your disqus_shortname, e.g. haomwei
+google_search: true ## Use Google search, true/false
+baidu_search: ## Use Baidu search, true/false
+swiftype: ## Your swiftype_key, e.g. m7b11ZrsT8Me7gzApciT
+tinysou: ## Your tinysou_key, e.g. 4ac092ad8d749fdc6293
+google_analytics: ## Your Google Analytics tracking id, e.g. UA-42425684-2
+baidu_analytics: ## Your Baidu Analytics tracking id, e.g. 8006843039519956000
+
+menu:
+  - page: home
+    directory: .
+    icon: icon-home
+  - page: archive
+    directory: archives/
+    icon: icon-archive
+  - page: about
+    directory: about/
+    icon: icon-about
+  - page: rss
+    directory: atom.xml
+    icon: icon-rss
+
+widgets: ## Six widgets in sidebar provided: search, category, tag, recent_posts, rencent_comments and links.
+  - search
+  - category
+  - tag
+  - recent_posts
+  - recent_comments
+  - links
+
+links:
+  - title: site-name1
+    url: http://www.example1.com/
+  - title: site-name2
+    url: http://www.example2.com/
+  - title: site-name3
+    url: http://www.example3.com/
+```
+- fancybox - Enable [Fancybox](http://fancyapps.com/fancybox/)
+- duoshuo - [Duoshuo](http://duoshuo.com) shortname
+- disqus - [Disqus](https://disqus.com) shortname
+- google_search - Default search engine
+- baidu_search - Search engine for users in China
+- swiftype - [Swiftype Search](https://swiftype.com) key
+- tinysou - [Tiny Search](http://tinysou.com) key
+- google_analytics - [Google Analytics](https://www.google.com/analytics/) tracking id
+- baidu_analytics - [Baidu Analytics](http://tongji.baidu.com) tracking id
+- menu - Customize your menu of pages here, just follow the format of existied items. Don't forget to create corresponding folders inlcuding `index.md` in `source` folder to ensure the pages will correctly display. [IcoMoon](https://icomoon.io) icon fonts have been integrated, and you can choose other icons you like [here](https://icomoon.io/app/#/select) and use them according to the  [instruction](https://icomoon.io/#docs)
+- widgets - Choose and arrange the widgets in sidebar here
+- links - Edit your blogroll here
+
+##Features
+#### Logo
+You can set a **favicon.ico** for your website, please put it into  `source` folder of hexo directory, recommended size: 32px*32px.
+
+You can add a website logo for apple devices, please put an image named **apple-touch-icon.png** into `source` folder of hexo directory, recommended size: 114px*114px.
+
+#### Abstract
+You can control the abstract of a post shown at index, by either filling a `description:` item in `front-matter` of the `post.md`, or just inserting a `<!--more-->` before your hidden content.
+
+#### Table of Contents
+TOC in a post can be enabled by adding a `toc: true` item in `front-matter`.
+
+#### Comments
+Comment feature of each post and page can be enabled (default) and disabled by adding a `comments: true` or `comments: false` in `front-matter`. This could be useful when you want comment feature for guestbook page, but don't want comment feature for about page.
+
+#### Syntax Highlighting
+Highlighted code showcase is supported, please set the `highlight` option in `_config.yml` of hexo directory like this:
+
+```
+highlight:
+  enable: true
+  auto_detect: true
+  line_number: true
+  tab_replace:
+```
+
+#### Languages
+Four languages are available for this theme currently: Simplified Chinese (zh-CN), Traditional Chinese (zh-TW), English (en) and Spanish (es-ES). Contributions of translating to other languages will be highly appreciated.
+
+## Solutions
+- Check whether your Terminal's current directory is in hexo's root directory which contains `source/`, `themes/`, etc.
 
-## Probable solutions
+- If you have any trouble in using this theme, please feel free to open an [issue](https://github.com/tufu9441/maupassant-hexo/issues).
 
-- Check version of hexo and review ![Migrating from 2.x to 3.0](https://github.com/hexojs/hexo/wiki/Migrating-from-2.x-to-3.0)
-- Check if your terminal's current directory is hexo's root directory which contains `source/`, `themes/`, etc.
-- Feel free to open an [issue](https://github.com/icylogic/maupassant-hexo/issues/new)
+## Contributing
+All kinds of contributions (enhancements, new features, documentation & code improvements, issues & bugs reporting) are welcome.
 
-## Maupassant on different platform:
+Looking forward to your pull request.
 
+## Acknowledgements
+Thank [JamesPan](http://blog.jamespan.me) for his help to improve this theme
+.
+## Maupassant on other platforms:
 + Typecho：https://github.com/pagecho/maupassant/
 + Octopress：https://github.com/pagecho/mewpassant/
 + Farbox：https://github.com/pagecho/Maupassant-farbox/
 + Wordpress：https://github.com/iMuFeng/maupassant/
-+ Hexo: https://github.com/icylogic/maupassant-hexo/
++ Ghost: https://github.com/LjxPrime/maupassant/

_config.yml

@@ -1,2 +1,39 @@
-fancybox: true
-duoshuo: # your duoshuo id
+fancybox: true ## If you want to use fancybox please set the value to true
+duoshuo: ## Your duoshuo_shortname, e.g. haomwei
+disqus: ## Your disqus_shortname, e.g. haomwei
+google_search: true ## Use Google search, true/false
+baidu_search: ## Use Baidu search, true/false
+swiftype: ## Your swiftype_key, e.g. m7b11ZrsT8Me7gzApciT
+tinysou: ## Your tinysou_key, e.g. 4ac092ad8d749fdc6293
+google_analytics: ## Your Google Analytics tracking id, e.g. UA-42425684-2
+baidu_analytics: ## Your Baidu Analytics tracking id, e.g. 8006843039519956000
+
+menu:
+  - page: home
+    directory: .
+    icon: icon-home
+  - page: archive
+    directory: archives/
+    icon: icon-archive
+  - page: about
+    directory: about/
+    icon: icon-about
+  - page: rss
+    directory: atom.xml
+    icon: icon-rss
+
+widgets: ## Six widgets in sidebar provided: search, category, tag, recent_posts, rencent_comments and links.
+  - search
+  - category
+  - tag
+  - recent_posts
+  - recent_comments
+  - links
+
+links:
+  - title: site-name1
+    url: http://www.example1.com/
+  - title: site-name2
+    url: http://www.example2.com/
+  - title: site-name3
+    url: http://www.example3.com/

languages/en.yml

@@ -1,11 +1,21 @@
-reading_label: currently reading articles under <b>%s</b>
+reading_label: Reading articles in %s
 blog: Blog
 albums: Albums
 categories: Categories
+tags: Tags
 archive: Archive
 links: Links
 about: About
 recent: Recent
-previous: Previous
 next: Next
-no-title: No Title
+previous: Previous
+notitle: No Title
+blogroll: Blogroll
+history: History
+rss: RSS
+guestbook: Guestbook
+home: Home
+recent_comments: Recent Comments
+Readmore: Read More
+belongsto: Categorized in
+contents: Contents

languages/es-ES.yml

@@ -0,0 +1,21 @@
+reading_label: Leyendo artículos en %s
+blog: Blog
+albums: Álbums
+categories: Categorías
+tags: Etiquetas
+archive: Archivo
+links: Enlaces
+about: Acerca de
+recent: Recientes
+next: Siguiente
+previous: Anterior
+notitle: Sin título
+blogroll: Blogroll
+history: Historial
+rss: RSS
+guestbook: Libro de visitas
+home: Inicio
+recent_comments: Comentarios recientes
+Readmore: Leer más
+belongsto: Guardado en
+contents: Contenidos

languages/zh-CN.yml

@@ -2,10 +2,20 @@ reading_label: 正在查看 %s 下的文章
 blog: 博客
 albums: 相册
 categories: 分类
+tags: 标签
 archive: 归档
 links: 链接
 about: 关于
 recent: 最新文章
 next: 下一页
 previous: 上一页
-no-title: 无题
+notitle: 无题
+blogroll: 友情链接
+history: 历史
+rss: 订阅
+guestbook: 留言
+home: 首页
+recent_comments: 最近评论
+Readmore: 阅读更多
+belongsto: 分类于
+contents: 文章目录

languages/zh-TW.yml

@@ -0,0 +1,21 @@
+reading_label: 正在查看 %s 下的文章
+blog: 部落格
+albums: 相簿
+categories: 分類
+tags: 標籤
+archive: 所有文章
+links: 連結
+about: 關於
+recent: 最新文章
+next: 下一頁
+previous: 上一頁
+notitle: 無標題
+blogroll: 友站連結
+history: 歷史紀錄
+rss: 訂閱
+guestbook: 留言
+home: 首頁
+recent_comments: 最近評論
+Readmore: 閱讀更多
+belongsto: 分類於
+contents: 文章目錄

layout/_partial/after_footer.jade

@@ -0,0 +1,61 @@
+!= js(url_for('js/codeblock-resizer.js'))
+
+if theme.fancybox
+  != js([url_for('js/fancybox.pack.js'), url_for('js/jquery.fancybox.js')])
+  != css(url_for('css/jquery.fancybox.css'))
+
+if theme.duoshuo
+  script.
+    var duoshuoQuery = {short_name:'#{theme.duoshuo}'};
+    (function() {
+        var ds = document.createElement('script');
+        ds.type = 'text/javascript';ds.async = true;
+        ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js';
+        ds.charset = 'UTF-8';
+        (document.getElementsByTagName('head')[0]
+            || document.getElementsByTagName('body')[0]).appendChild(ds);
+    })();
+
+if theme.tinysou
+  script.
+    var option = {
+      engineKey: '#{theme.tinysou}'
+    };
+    (function(w,d,t,u,n,s,e){
+      s = d.createElement(t);
+      s.src = u;
+      s.async = 1;
+      w[n] = function(r){
+        w[n].opts = r;
+      };
+      e = d.getElementsByTagName(t)[0];
+      e.parentNode.insertBefore(s, e);
+    })(window,document,'script','//tinysou-cdn.b0.upaiyun.com/ts.js','_ts');
+    _ts(option);
+
+if theme.swiftype
+  script.
+    (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
+    (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
+    e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e);
+    })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
+
+    _st('install','#{theme.swiftype}','2.0.0');
+
+if theme.google_analytics
+  script.
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    ga('create','#{theme.google_analytics}','auto');ga('send','pageview');
+
+if theme.baidu_analytics
+  script.
+    var _hmt = _hmt || [];
+    (function() {
+      var hm = document.createElement("script");
+      hm.src = "//hm.baidu.com/hm.js?#{theme.baidu_analytics}";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+      })();

layout/_partial/comments.jade

@@ -1,14 +1,16 @@
 if theme.duoshuo
-    .ds-thread(data-thread-key=page.path, date-title=page.title, data-url=url_for(page.path))
-  script.
-    var duoshuoQuery = {short_name:"!{theme.duoshuo}"};
-    (function() {
-        var ds = document.createElement('script');
-        ds.type = 'text/javascript';ds.async = true;
-        ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js';
-        ds.charset = 'UTF-8';
-        (document.getElementsByTagName('head')[0] 
-            || document.getElementsByTagName('body')[0]).appendChild(ds);
-    })();
-
+  .ds-thread(data-thread-key=page.path, data-title=page.title, data-url=page.permalink, data-author-key='1')
 
+if theme.disqus
+  #disqus_thread
+    script.
+      var disqus_shortname = '#{theme.disqus}';
+      var disqus_identifier = '#{page.path}';
+      var disqus_title = '#{page.title}';
+      var disqus_url = '#{config.url}/#{page.path}';
+      (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+      })();
+    script(id='dsq-count-scr' src='//#{theme.disqus}.disqus.com/count.js' async)

layout/_partial/helpers.jade

@@ -1,9 +1,11 @@
 mixin a_with_current(href, content, id)
   - var url = url_for(href)
-  if (href == '/' && (is_home() || is_post())) || is_current(href)
-    a.current(id=id, href=url)= content
+  if (href == '.' && (is_home() || is_post())) || is_current(href)
+    a.current(href=url)
+      i(class=id)= ' ' + content
   else
-    a(id=id, href=url)= content
+    a(href=url)
+      i(class=id)= ' ' + content
 
 mixin title(page)
   if page