Skip to content

Commit

Permalink
feat: page layout configs & layout/all -> layout/archive & layout/hom…
Browse files Browse the repository at this point in the history
…e -> layout/post-list & layout/error-404 -> layout/404
  • Loading branch information
kitian616 committed May 26, 2018
1 parent e4e8146 commit b6ab447
Show file tree
Hide file tree
Showing 82 changed files with 713 additions and 785 deletions.
3 changes: 2 additions & 1 deletion 404.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
layout: error-404
layout: 404
title: 404
show_title: false
---
12 changes: 11 additions & 1 deletion _config.demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ repository_tree: master
paths:
base: /
home: https://github.com/kitian616/jekyll-TeXt-theme/
# all: /all.html
# all: /archive.html
# rss: /feed.xml

nav_lists:
Expand Down Expand Up @@ -137,6 +137,7 @@ leancloud:
ga_tracking_id: UA-71907556-1 #Google analytics id for the site
ga_anonymize_ip: false # Anonymize IP tracking for Analytics


## => Build
##############################
markdown: kramdown
Expand All @@ -161,6 +162,15 @@ exclude:
# - /test
- /vendor

defaults:
- scope:
path: ""
type: "posts"
values:
aside:
toc: true
pageview: true


## => Plugins
##############################
Expand Down
12 changes: 11 additions & 1 deletion _config.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ repository_tree: master
paths:
base: /
home: /
all: /all.html
all: /archive.html
rss: /feed.xml

nav_lists:
Expand Down Expand Up @@ -139,6 +139,7 @@ leancloud:
ga_tracking_id: # Google Analytics id for the site
ga_anonymize_ip: false # Anonymize IP tracking for Analytics


## => Build
##############################
markdown: kramdown
Expand All @@ -163,6 +164,15 @@ exclude:
# - /test
- /vendor

defaults:
- scope:
path: ""
type: "posts"
values:
aside:
toc: true
pageview: true


## => Plugins
##############################
Expand Down
12 changes: 11 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ repository_tree: master
paths:
base: /
home: /
all: /all.html
all: /archive.html
rss: /feed.xml

nav_lists:
Expand Down Expand Up @@ -133,6 +133,7 @@ leancloud:
ga_tracking_id: # Google Analytics id for the site
ga_anonymize_ip: false # Anonymize IP tracking for Analytics


## => Build
##############################
markdown: kramdown
Expand All @@ -157,6 +158,15 @@ exclude:
- /test
- /vendor

defaults:
- scope:
path: ""
type: "posts"
values:
aside:
toc: true
pageview: true


## => Plugins
##############################
Expand Down
4 changes: 3 additions & 1 deletion _data/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ default:
paths:
base: /
home: /
all: /all.html
all: /archive.html
rss: /feed.xml
mathjax: false
mathjax_autoNumber: false
mermaid: false
chart: false
toc:
selectors: 'h1,h2,h3'
show_title: true
pageview: false
excerpt_type: text
sources: bootcdn

Expand Down
19 changes: 13 additions & 6 deletions _includes/article-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
{%- assign cur_page = page -%}
{%- endif -%}

{%- assign __source = page.pageview -%}
{%- assign __target = site.data.variables.default.pageview -%}
{%- include snippets/assign.html -%}
{%- assign _pageview = __return -%}

<div class="article-info clearfix">
{%- if page -%}
<meta itemprop="author" itemscope itemtype="https://schema.org/Person">
Expand Down Expand Up @@ -32,12 +37,14 @@
</ul>
{%- endif -%}
<ul class="article-info__right-col menu">
{%- if site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class -%}
{%- assign __locale = site.data.locale.VIEWS } -%}
{%- include snippets/locale-to-string.html -%}
<li class="pageview">
<span class="js-pageview" data-page-key="{{ cur_page.key }}">0</span> {{ __return }}
</li>
{%- if _pageview or post -%}
{%- if site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class -%}
{%- assign __locale = site.data.locale.VIEWS } -%}
{%- include snippets/locale-to-string.html -%}
<li class="pageview">
<span class="js-pageview" data-page-key="{{ cur_page.key }}">0</span> {{ __return }}
</li>
{%- endif -%}
{%- endif -%}
<li class="publish-date">
{%- assign __locale = site.data.locale.ARTICLE_DATE_FORMAT } -%}
Expand Down
1 change: 1 addition & 0 deletions _includes/aside/toc.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="toc-aside js-toc-root"></div>
9 changes: 5 additions & 4 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
{%- assign href = __return -%}
{%- assign __locale = site.data.locale.NAV.RSS -%}
{%- include snippets/locale-to-string.html -%}
<div class="menu menu--center">
<p class="site-info__copyright">© {{ site.title }} {{ site.data.locale.COPYRIGHT_DATES }}</p>
<p>
<span class="site-info__copyright">© {{ site.title }} {{ site.data.locale.COPYRIGHT_DATES }}</span>
<a class="site-info__rss" type="application/rss+xml" href="{{ href }}">{{ __return }}</a>
</div>
</p>
<p>Powered by <a title="Jekyll is a simple, blog-aware, static site generator." href="http://jekyllrb.com/">Jekyll</a> & <a
title="TeXt is a succinct theme for blogging." href="https://github.com/kitian616/jekyll-TeXt-theme">TeXt Theme</a>.</p>
title="TeXt is a succinct theme for blogging." href="https://github.com/kitian616/jekyll-TeXt-theme">TeXt Theme</a>.
</p>
</footer>
</div>
</div>
18 changes: 15 additions & 3 deletions _includes/markdown-enhancements.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
{%- assign __target = site.chart | default: site.data.variables.default.chart -%}
{%- assign __target = site.data.variables.default.chart -%}
{%- assign __source = site.chart -%}
{%- include snippets/assign.html -%}

{%- assign __target = __return -%}
{%- assign __source = page.chart -%}
{%- include snippets/assign.html -%}
{%- if __return == true -%}
{%- include markdown-enhancements/chart.html -%}
{%- endif -%}

{%- assign __target = site.mathjax | default: site.data.variables.default.mathjax -%}
{%- assign __target = site.data.variables.default.mathjax -%}
{%- assign __source = site.chart -%}
{%- include snippets/assign.html -%}

{%- assign __target = __return -%}
{%- assign __source = page.mathjax -%}
{%- include snippets/assign.html -%}
{%- if __return == true -%}
{%- include markdown-enhancements/mathjax.html -%}
{%- endif -%}

{%- assign __target = site.mermaid | default: site.data.variables.default.mermaid -%}
{%- assign __target = site.data.variables.default.mermaid -%}
{%- assign __source = site.chart -%}
{%- include snippets/assign.html -%}

{%- assign __target = __return -%}
{%- assign __source = page.mermaid -%}
{%- include snippets/assign.html -%}
{%- if __return == true -%}
Expand Down
6 changes: 5 additions & 1 deletion _includes/markdown-enhancements/mathjax.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{%- include snippets/get-sources.html -%}
{%- assign _sources = __return -%}

{%- assign __target = site.mathjax_autoNumber | default: site.data.variables.default.mathjax_autoNumber -%}
{%- assign __target = site.data.variables.default.mathjax_autoNumber -%}
{%- assign __source = site.mathjax_autoNumber -%}
{%- include snippets/assign.html -%}

{%- assign __target = __return -%}
{%- assign __source = page.mathjax_autoNumber -%}
{%- include snippets/assign.html -%}

Expand Down
23 changes: 16 additions & 7 deletions _includes/pageview.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
{%- if page.layout == "home" -%}
{%- if jekyll.environment != "development" -%}
{%- assign __source = page.pageview -%}
{%- assign __target = site.data.variables.default.pageview -%}
{%- include snippets/assign.html -%}
{%- assign _pageview = __return -%}


{%- include pageview-providers/leancloud/home.html -%}
{%- if page.layout == "post-list" -%}

{%- if jekyll.environment != "development" -%}
{%- include pageview-providers/leancloud/post-list.html -%}
{%- endif -%}
{%- elsif page.layout == "post" -%}
{%- if jekyll.environment != "development" and
jekyll.environment != "beta" -%}

{%- include pageview-providers/leancloud/post.html -%}

{%- elsif page.layout == "article" -%}
{%- if _pageview -%}

{%- if jekyll.environment != "development" and
jekyll.environment != "beta" -%}
{%- include pageview-providers/leancloud/post.html -%}
{%- endif -%}

{%- endif -%}
{%- endif -%}
24 changes: 24 additions & 0 deletions _includes/scripts/article.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
(function() {
var SOURCES = window.TEXT_VARIABLES.sources;
window.Lazyload.js(SOURCES.jquery, function() {
$(function() {
var $this ,$scroll;
var $articleContent = $('.js-article-content');
var hasSidebar = $('.js-page-root').hasClass('layout--page--sidebar');
var scroll = hasSidebar ? '.js-page-main' : 'html, body';
$scroll = $(scroll);

$articleContent.children('.highlight').each(function() {
$this = $(this);
$this.attr('data-lang', $this.find('code').attr('data-lang'));
});
$articleContent.children('h1, h2, h3, h4, h5, h6').each(function() {
$this = $(this);
$this.append($('<a class="anchor" aria-hidden="true"></a>').html('<i class="fas fa-anchor"></i>'));
});
$articleContent.on('click', '.anchor', function() {
$scroll.scrollToAnchor('#' + $(this).parent().attr('id'), 400);
});
});
});
})();
26 changes: 26 additions & 0 deletions _includes/scripts/aside/affix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(function() {
var SOURCES = window.TEXT_VARIABLES.sources;
window.Lazyload.js(SOURCES.jquery, function() {
var $window = $(window), $pageFooter = $('.js-page-footer');
var $pageAside = $('.js-page-aside');
var affix;
var tocDisabled = false;
var hasSidebar = $('.js-page-root').hasClass('layout--page--sidebar');

setTimeout(function() {
affix = $pageAside.affix({
offsetBottom: $pageFooter.outerHeight(),
scrollTarget: hasSidebar ? '.js-page-main' : null,
scroller: hasSidebar ? '.js-page-main' : null,
scroll: hasSidebar ? $('.js-page-main').children() : null,
disabled: tocDisabled
});
}, 1000);

$window.on('resize', window.throttle(function() {
affix && affix.setOptions({
disabled: tocDisabled
});
}, 100));
});
})();
38 changes: 11 additions & 27 deletions _includes/scripts/post.js → _includes/scripts/aside/toc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,18 @@
var SOURCES = window.TEXT_VARIABLES.sources;
var TOC_SELECTOR = window.TEXT_VARIABLES.site.toc.selectors;
window.Lazyload.js(SOURCES.jquery, function() {
var $window = $(window);
var $pageMain = $('.js-page-main');
var $pageFooter = $('.js-page-footer');
var $window = $(window), $pageMain = $('.js-page-main');
var $articleContent = $('.js-article-content');
var $articleAside = $('.js-article-aside');
var $tocRoot = $('.js-toc-root');
var $col2 = $('.js-col-2');
var toc, affix;
var $tocRoot = $('.js-toc-root'), $col2 = $('.js-col-2');
var toc;
var tocDisabled = false;
var hasSidebar = $('.js-page-root').hasClass('layout--page--sidebar');
var hasToc = $articleContent.find(TOC_SELECTOR).length > 0;
var tocDisabled = false;

function disabled() {
return $col2.css('display') === 'none' || !hasToc;
}

$window.on('resize', window.throttle(function() {
tocDisabled = disabled();
toc && toc.setOptions({
disabled: tocDisabled
});
affix && affix.setOptions({
disabled: tocDisabled
});
}, 100));

if (hasToc) {
!$pageMain.hasClass('has-toc') && $pageMain.addClass('has-toc');
}
tocDisabled = disabled();

setTimeout(function() {
Expand All @@ -41,13 +24,14 @@
scroller: hasSidebar ? '.js-page-main' : null,
disabled: tocDisabled
});
affix = $articleAside.affix({
offsetBottom: $pageFooter.outerHeight(),
scrollTarget: hasSidebar ? '.js-page-main' : null,
scroller: hasSidebar ? '.js-page-main' : null,
scroll: hasSidebar ? $('.js-page-main').children() : null,
}, 1000);

$window.on('resize', window.throttle(function() {
tocDisabled = disabled();
toc && toc.setOptions({
disabled: tocDisabled
});
}, 1000);
}, 100));

});
})();
21 changes: 0 additions & 21 deletions _includes/scripts/page-post-common.js

This file was deleted.

File renamed without changes.
Loading

0 comments on commit b6ab447

Please sign in to comment.