Merge pull request #2 from alexandrevicenzi/master

Getting latest changes
This commit is contained in:
Artium Nihamkin 2019-05-04 15:13:42 +03:00 committed by GitHub
commit c33be913f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 3408 additions and 704 deletions

View file

@ -29,7 +29,9 @@
{% endif %}
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/pygments/{{ PYGMENTS_STYLE|default('github') }}.min.css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/fontawesome.css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/brands.css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/solid.css">
{% if CUSTOM_CSS %}
<link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet">
@ -105,12 +107,14 @@
{% if pages or LINKS %}
<nav>
<ul class="list">
{% if not PAGES_SORT_ATTRIBUTE -%}
{% set PAGES_SORT_ATTRIBUTE = 'title' %}
{% if PAGES_SORT_ATTRIBUTE -%}
{% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
{%- endif %}
{% for page in pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for page in pages %}
<li><a href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
{% endfor %}
{% endif %}
{% for name, link in LINKS %}
{% if DISABLE_PAGE_BLANK_TARGET %}
@ -125,7 +129,11 @@
<ul class="social">
{% for name, link in SOCIAL %}
<li><a class="sc-{{ name }}" href="{{ link }}" target="_blank"><i class="fa fa-{{ name }}"></i></a></li>
<li>
<a {% if name == 'mastodon' %}rel="me"{% endif %} class="sc-{{ name }}" href="{{ link }}" target="_blank">
<i class="{% if name in ['envelope', 'rss'] %}fas{% else %}fab{% endif %} fa-{{ name }}">
</i>
</a></li>
{% endfor %}
</ul>
</div>

View file

@ -43,8 +43,10 @@
<img src="{{ article.featured_image }}">
{% endif %}
{{ article.summary }}
<br>
<a class="btn" href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_URL_HASH %}#{{ article.slug }}{% endif %}">{{ _('Continue reading') }}</a>
{% if article.content != article.summary %}
<br>
<a class="btn" href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_URL_HASH %}#{{ article.slug }}{% endif %}">{{ _('Continue reading') }}</a>
{% endif %}
{% else %}
{{ article.content }}
{% endif %}

View file

@ -1,12 +1,12 @@
{% if 'neighbors' in PLUGINS %}
<div class="neighbors">
{% if article.prev_article %}
<a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title }}">
<a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title|striptags }}">
<i class="fa fa-angle-left"></i> {{ _('Previous Post') }}
</a>
{% endif %}
{% if article.next_article %}
<a class="btn float-right" href="{{ SITEURL }}/{{ article.next_article.url }}" title="{{ article.next_article.title }}">
<a class="btn float-right" href="{{ SITEURL }}/{{ article.next_article.url }}" title="{{ article.next_article.title|striptags }}">
{{ _('Next Post') }} <i class="fa fa-angle-right"></i>
</a>
{% endif %}

View file

@ -1,7 +1,7 @@
<!-- StatusCake -->
{% if STATUSCAKE['trackid'] %}
<a href="https://www.statuscake.com" title="{{ SITENAME }} Uptime">
<img src="https://www.statuscake.com/App/button/index.php?Track={{ STATUSCAKE['trackid'] }}&amp;Days={{ STATUSCAKE['days'] }}&amp;Design={{ STATUSCAKE['design'] }}" alt="{{ SITENAME }} Uptime"/>
<img src="https://app.statuscake.com/button/index.php?Track={{ STATUSCAKE['trackid'] }}&amp;Days={{ STATUSCAKE['days'] }}&amp;Design={{ STATUSCAKE['design'] }}" alt="{{ SITENAME }} Uptime"/>
</a>
{% endif %}