Merge branch 'master' of https://github.com/ppoffice/hexo-theme-icarus

README.md

@@ -17,7 +17,8 @@ $ git clone https://github.com/ppoffice/hexo-theme-icarus.git themes/icarus
 
 1. Rename `themes\icarus\_config.yml.example` to `themes\icarus\_config.yml`;
 2. Copy `themes\icarus\_config.yml.site.example` to your hexo blog's root directory and rename it to `_config.yml`;
-3. Then modify `theme` setting in `_config.yml` to `icarus`.
+3. Copy `themes\icarus\_source\*` into your hexo blog's directory `source`;
+4. Then modify `theme` setting in `_config.yml` to `icarus`.
 
 ### Update
 

_config.yml.example

@@ -40,7 +40,11 @@ contacts:
 links:
   Hexo: http://hexo.io
 
+# CDN
+cdn: useso #If your site loads slowly change it to "google" , because "useso" is slow out of China
+
 # Miscellaneous
+google_site_verification:
 google_analytics:
 favicon: favicon.png
 twitter:

languages/en.yml

@@ -8,6 +8,8 @@ index:
 nav:
   next: 'Next'
   prev: 'Prev'
+  older: 'Older'
+  newer: 'Newer'
 widget:
   recents: 'recents'
   archives: 'archives'
@@ -18,9 +20,10 @@ widget:
 article:
   comments: 'Comments'
   share: 'Share'
+  catalogue: 'Catalogue'
 profile:
   follow: 'FOLLOW'
   post: 'post'
   tag: 'tag'
   posts: 'posts'
-  tags: 'tags'
+  tags: 'tags'

languages/es.yml

@@ -0,0 +1,30 @@
+#By SrWoOoW 
+index:
+  home: 'Inicio'
+  search: 'Buscar'
+  archive: 'Archivo'
+  category: 'Categoria'
+  uncategorized: 'Sin categoría'
+  tag: 'Etiqueta'
+nav:
+  next: 'Siguiente '
+  prev: 'Anterior'
+  older: 'Más viejo'
+  newer: 'Más nuevo'
+widget:
+  recents: 'Recientes'
+  archives: 'Archivos'
+  categories: 'Categorias'
+  links: 'Links'
+  tags: 'Etiquetas'
+  tag_cloud: 'Nube de etiquetas'
+article:
+  comments: 'Comentarios'
+  share: 'Compartir'
+  catalogue: 'Catálogo'
+profile:
+  follow: 'SEGUIR'
+  post: 'Entrada'
+  tag: 'Etiqueta'
+  posts: 'Entradas'
+  tags: 'Etiquetas'

languages/id.yml

@@ -8,6 +8,8 @@ index:
 nav:
   next: 'Berikutnya'
   prev: 'Sebelumnya'
+  older: 'Lebih Tua'
+  newer: 'Lebih baru'
 widget:
   recents: 'terbaru'
   archives: 'arsip'

languages/ja.yml

@@ -0,0 +1,29 @@
+index:
+  home: 'ホーム'
+  search: '検索'
+  archive: 'アーカイブ'
+  category: 'カテゴリ'
+  uncategorized: '未分類'
+  tag: 'タグ'
+nav:
+  next: '次'
+  prev: '前'
+  older: '古い記事'
+  newer: '新しい記事'
+widget:
+  recents: '最近の記事'
+  archives: 'アーカイブ'
+  categories: 'カテゴリ'
+  links: 'リンク'
+  tags: 'タグ'
+  tag_cloud: 'タグクラウド'
+article:
+  comments: 'コメント'
+  share: '共有'
+  catalogue: 'カタログ'
+profile:
+  follow: 'フォローする'
+  post: '投稿'
+  tag: 'タグ'
+  posts: '投稿'
+  tags: 'タグ'

languages/ru.yml

@@ -0,0 +1,29 @@
+index:
+  home: 'Главная'
+  search: 'Поиск'
+  archive: 'архив'
+  category: 'категории'
+  uncategorized: 'без категории'
+  tag: 'тэг'
+nav:
+  next: 'Далее'
+  prev: 'Назад'
+  older: 'Старые'
+  newer: 'Новые'
+widget:
+  recents: 'недавние'
+  archives: 'архивы'
+  categories: 'категории'
+  links: 'ссылки'
+  tags: 'тэги'
+  tag_cloud: 'облако тэгов'
+article:
+  comments: 'Комментарии'
+  share: 'Поделиться'
+  catalogue: 'Каталог'
+profile:
+  follow: 'Подписаться'
+  post: 'пост'
+  tag: 'тэг'
+  posts: 'посты'
+  tags: 'тэги'

languages/zh-CN.yml

@@ -8,6 +8,8 @@ index:
 nav:
   next: '下一页'
   prev: '上一页'
+  older: '下一篇'
+  newer: '上一篇'
 widget:
   recents: '最新文章'
   archives: '归档'
@@ -18,9 +20,10 @@ widget:
 article:
   comments: '评论'
   share: '分享到'
+  catalogue: '文章目录'
 profile:
   follow: '关注我'
   post: '文章'
   tag: '标签'
   posts: '文章'
-  tags: '标签'
+  tags: '标签'

layout/_partial/after-footer.ejs

@@ -24,7 +24,7 @@
 </script>
 <% } %>
 
-<script src="//ajax.useso.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+<%- partial('cdn_after_footer') %>
 
 <% if (theme.fancybox){ %>
   <%- css('fancybox/jquery.fancybox') %>

layout/_partial/article.ejs

@@ -22,6 +22,12 @@
           </p>
         <% } %>
       <% } else { %>
+                <% if (!index && post.toc){ %>
+                    <div id="toc" class="toc-article">
+                    <strong class="toc-title"><%= __('article.catalogue') %></strong>
+    <%- toc(post.content) %>
+  </div>
+<% } %>
         <%- post.content %>
       <% } %>
     </div>

layout/_partial/cdn_after_footer.ejs

@@ -0,0 +1,5 @@
+<% if (theme.cdn == "google"){ %>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+<% } else if (theme.cdn == "useso"){ %>
+ <script src="//ajax.useso.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+<% } %>

layout/_partial/cdn_head.ejs

@@ -0,0 +1,7 @@
+<% if (theme.cdn == "google"){ %>
+ <link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,600' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Source+Code+Pro' rel='stylesheet' type='text/css'>
+<% } else if (theme.cdn == "useso"){ %>
+ <link href='//fonts.useso.com/css?family=Open+Sans:400italic,400,600' rel='stylesheet' type='text/css'>
+ <link href="//fonts.useso.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css">
+<% } %>

layout/_partial/google_site_verification.ejs

@@ -0,0 +1,3 @@
+<% if (theme.google_site_verification){ %>
+<meta name="google-site-verification" content="<%= theme.google_site_verification %>" />
+<% } %>

layout/_partial/head.ejs

@@ -28,11 +28,11 @@
   <% if (theme.favicon){ %>
     <link rel="icon" href="<%- theme.favicon %>">
   <% } %>
-  <link href='//fonts.useso.com/css?family=Open+Sans:400italic,400,600' rel='stylesheet' type='text/css'>
-  <link href="//fonts.useso.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css">
+  <%- partial('cdn_head') %>
   <%- css('css/style') %>
   <%- css('font-awesome/css/font-awesome.min') %>
   <%- partial('google-analytics') %>
+  <%- partial('google_site_verification') %>
   <% if( theme.customstylesheet ){ %>
     <%- css('css/'+theme.customstylesheet) %>
   <% } %>

layout/_partial/post/nav.ejs

@@ -2,7 +2,7 @@
 <nav id="article-nav">
   <% if (post.prev){ %>
     <a href="<%- url_for(post.prev.path) %>" id="article-nav-newer" class="article-nav-link-wrap">
-      <strong class="article-nav-caption">Newer</strong>
+      <strong class="article-nav-caption"><%= __('nav.newer') %></strong>
       <div class="article-nav-title">
         <% if (post.prev.title){ %>
           <%= post.prev.title %>
@@ -14,9 +14,9 @@
   <% } %>
   <% if (post.next){ %>
     <a href="<%- url_for(post.next.path) %>" id="article-nav-older" class="article-nav-link-wrap">
-      <strong class="article-nav-caption">Older</strong>
+      <strong class="article-nav-caption"><%= __('nav.older') %></strong>
       <div class="article-nav-title"><%= post.next.title %></div>
     </a>
   <% } %>
 </nav>
-<% } %>
+<% } %>

source/css/_partial/article.styl

@@ -337,4 +337,51 @@ $article-share-link
   img
     display: block
     max-width: 100%
-    margin: 0 auto
+    margin: 0 auto
+
+/*  toc */
+.toc-article
+  background #F9F9F9
+  margin 2em 0 0 0.2em
+  padding 1em
+  border-radius 0px
+  .toc-title
+    font-size 120%
+  strong
+    padding 0.3em 1
+ol.toc
+  width 100%
+  margin 1em 2em 0 0
+#toc
+  line-height 1em
+  font-size 0.8em
+  float right
+  .toc
+    padding 0 
+    li
+      list-style-type none
+  .toc-child 
+    padding-left 0em
+#toc.toc-aside
+  display none
+  width 13%
+  position fixed
+  right 2%
+  top 320px
+  overflow hidden
+  line-height 1.5em
+  font-size 1em
+  color color-heading
+  opacity .6
+  transition opacity 1s ease-out
+  strong
+    padding 0.3em 0
+    color color-font
+  &:hover
+    transition opacity .3s ease-out
+    opacity 1
+  a
+    transition color 1s ease-out
+    &:hover
+      color color-theme
+      transition color .3s ease-out