Merge remote-tracking branch 'pchampin/improvements' into pchampin-improvements

This commit is contained in:
Michiel Scholten 2020-01-05 11:13:52 +01:00
commit e3d3f0e9ec
13 changed files with 69 additions and 2690 deletions

File diff suppressed because one or more lines are too long

View file

@ -90,6 +90,38 @@ hr {
text-decoration: underline
}
.admonition {
border: thin solid gray;
background-color: lightgrey;
padding: .25em .5em;
margin-bottom: 1rem;
}
.admonition .admonition-title {
font-weight: bold;
background-color: rgba(255,255,255,0.66);
text-align: center;
}
.admonition p.last {
margin-bottom: 0;
}
.admonition.important, .admonition.note, .admonition.warning {
border-color: goldenrod;
background-color: lightgoldenrodyellow;
}
.admonition.attention, .admonition.caution, .admonition.danger, .admonition.error {
border-color: red;
background-color: lightpink;
}
.admonition.hint, .admonition.tip {
border-color: limegreen;
background-color: palegreen;
}
@media (min-width: 576px) {
.header .title {
font-size: 3rem;
@ -109,4 +141,4 @@ hr {
.teaser header li:not(:last-child) {
margin-right: 10px;
}
}
}

File diff suppressed because it is too large Load diff

Before

Width:  |  Height:  |  Size: 434 KiB

View file

@ -18,16 +18,18 @@
<header>
<ul class="list-inline">
<li class="list-inline-item text-muted" title="{{ article.date.isoformat() }}">
<i class="fa fa-clock-o"></i>
<i class="fas fa-clock"></i>
{{ article.locale_date }}
</li>
{% if not HIDE_CATEGORIES %}
<li class="list-inline-item">
<i class="fa fa-folder-open-o"></i>
<i class="fas fa-folder-open"></i>
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</li>
{% endif %}
{% if not HIDE_AUTHORS and article.authors %}
<li class="list-inline-item">
<i class="fa fa-user-o"></i>
<i class="fas fa-user"></i>
{% for author in article.authors %}
<a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
@ -35,12 +37,20 @@
{% endif %}
{% if article.tags %}
<li class="list-inline-item">
<i class="fa fa-files-o"></i>
<i class="fas fa-tag"></i>
{% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</li>
{% endif %}
{% if article.translations %}
<li class="list-inline-item">
<i class="fas fa-globe"></i>
{% for translation in article.translations %}
<a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
{% endfor %}
</li>
{% endif %}
</ul>
</header>
<div class="content">

View file

@ -27,9 +27,9 @@
{% endif %}
<link rel="stylesheet" href="{{ url(BOOTSTRAP_CSS or '/theme/css/bootstrap.min.css') }}">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/font-awesome.min.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments/{{ PYGMENTS_STYLE|default('default') }}.min.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/theme.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
{% for stylesheet in THEME_CSS_OVERRIDES or () %}
<link rel="stylesheet" href="{{ url(stylesheet) }}">
{% endfor %}

View file

@ -5,7 +5,9 @@
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ AUTHORS_URL or AUTHORS_SAVE_AS or 'authors.html' }}">Authors</a></li>
{% endif %}
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ ARCHIVES_URL or ARCHIVES_SAVE_AS or 'archives.html' }}">Archives</a></li>
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ CATEGORIES_URL or CATEGORIES_SAVE_AS or 'categories.html' }}">Categories</a></li>
{% if not HIDE_CATEGORIES %}
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ CATEGORIES_URL or CATEGORIES_SAVE_AS or 'categories.html' }}">Categories</a></li>
{% endif %}
{% if tags|length %}
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ TAGS_URL or TAGS_SAVE_AS or 'tags.html' }}">Tags</a></li>
{% endif %}

View file

@ -28,7 +28,7 @@
{% if (LINKS or (DISPLAY_PAGES_ON_MENU and pages)) and loop.first %}
<li class=" list-inline-item text-muted">|</li>
{% endif %}
<li class="list-inline-item"><a class="fa fa-{{ icon }}" href="{{ url(link) }}" target="_blank"></a></li>
<li class="list-inline-item"><a class="fab fa-{{ icon }}" href="{{ url(link) }}" target="_blank"></a></li>
{% endfor %}
</ul>
{% endif %}

View file

@ -13,14 +13,14 @@
href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}">{% endif %}
{% if CATEGORY_FEED_ATOM and category %}
<link rel="alternate" type="application/atom+xml" title="Categories Atom Feed"
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(slug=category.slug) }}">{% endif %}
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}">{% endif %}
{% if CATEGORY_FEED_RSS and category %}
<link rel="alternate" type="application/rss+xml" title="Categories RSS Feed"
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(slug=category.slug) }}">{% endif %}
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}">{% endif %}
{% if TAG_FEED_ATOM and tag %}
<link rel="alternate" type="application/atom+xml" title="Tags Atom Feed"
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(slug=tag.slug) }}">{% endif %}
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM.format(slug=tag.slug) }}">{% endif %}
{% if TAG_FEED_RSS and tag %}
<link rel="alternate" type="application/rss+xml" title="Tags RSS Feed"
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(slug=tag.slug) }}">
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS.format(slug=tag.slug) }}">
{% endif %}

View file

@ -21,21 +21,31 @@
<header class="col-sm-4 text-muted">
<ul>
<li title="{{ article.date.isoformat() }}">
<i class="fa fa-clock-o"></i>
<i class="fas fa-clock"></i>
{{ article.locale_date }}
</li>
{% if not HIDE_CATEGORIES %}
<li>
<i class="fa fa-folder-open-o"></i>
<i class="fas fa-folder-open"></i>
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</li>
{% endif %}
{% if not HIDE_AUTHORS and article.authors %}
<li>
<i class="fa fa-user-o"></i>
<i class="fas fa-user"></i>
{% for author in article.authors %}
<a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</li>
{% endif %}
{% if TAGS_IN_INDEX and article.tags %}
<li>
<i class="fas fa-tag"></i>
{% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</li>
{% endif %}
</ul>
</header>
<div class="col-sm-8">