ry
/
datat.fi
6
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' of https://github.com/mmistakes/jekyll-theme-basically-basic

This commit is contained in:
Michael Rose 2017-12-14 11:21:44 -05:00
parent 0b37fc76a2 afb6060a25
commit d0b6c4df38
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_includes/contact-list.html
View File

@ -17,7 +17,7 @@
{% endif %} {% endif %}
<li> <li>
{% if site.plugins contains 'jekyll-feed' %} {% if site.plugins contains 'jekyll-feed' or site.gems contains 'jekyll-feed' %}
<a href="{{ site.feed.path | default: 'feed.xml' | relative_url }}" title="Atom Feed"> <a href="{{ site.feed.path | default: 'feed.xml' | relative_url }}" title="Atom Feed">
<span class="icon icon--rss">{% include icon-rss.svg %}</span> <span class="icon icon--rss">{% include icon-rss.svg %}</span>
<span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span> <span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>

4
_includes/head.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
{% if site.gems contains 'jekyll-seo-tag' %} {% if site.plugins contains 'jekyll-seo-tag' or site.gems contains 'jekyll-seo-tag' %}
{% comment %} {% comment %}
Add metadata for search engines and social networks if jekyll-seo-tag plugin is enabled Add metadata for search engines and social networks if jekyll-seo-tag plugin is enabled
{% endcomment %} {% endcomment %}
@ -26,7 +26,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family={% for font in site.data.theme.google_fonts %}{{ font.name | replace: ' ', '+' }}{% if font.weights %}:{% endif %}{{ font.weights | remove: ' ' }}{% if forloop.last != true %}|{% endif %}{% endfor %}"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={% for font in site.data.theme.google_fonts %}{{ font.name | replace: ' ', '+' }}{% if font.weights %}:{% endif %}{{ font.weights | remove: ' ' }}{% if forloop.last != true %}|{% endif %}{% endfor %}">
{% endif %} {% endif %}
{% if site.gems contains 'jekyll-feed' %} {% if site.plugins contains 'jekyll-feed' or site.gems contains 'jekyll-feed'%}
{% comment %} {% comment %}
Add Atom feed link if jekyll-feed plugin is enabled Add Atom feed link if jekyll-feed plugin is enabled
{% endcomment %} {% endcomment %}

2
_layouts/home.html
View File

@ -13,7 +13,7 @@ layout: default
<h2>{{ site.data.theme.t.posts | default: 'Posts' }}{% if paginator.page > 1 %}{{ site.data.theme.t.page | default: 'Page' | prepend: ' - ' | append: ' ' }}{{ paginator.page }} {{ site.data.theme.t.of | default: 'of' }} {{ paginator.total_pages }}{% endif %}</h2> <h2>{{ site.data.theme.t.posts | default: 'Posts' }}{% if paginator.page > 1 %}{{ site.data.theme.t.page | default: 'Page' | prepend: ' - ' | append: ' ' }}{{ paginator.page }} {{ site.data.theme.t.of | default: 'of' }} {{ paginator.total_pages }}{% endif %}</h2>
</header> </header>
<div class="entries"> <div class="entries">
{% if site.plugins contains 'jekyll-paginate' and page.paginate %} {% if site.plugins contains 'jekyll-paginate' and page.paginate or site.gems contains 'jekyll-paginate' and page.paginate %}
{% comment %} {% comment %}
Add paginator.posts loop if jekyll-paginate plugin is enabled Add paginator.posts loop if jekyll-paginate plugin is enabled
and page.paginate == true and page.paginate == true