From e0d18dc67c16b31a550f750a7fad31a91a7ebdb1 Mon Sep 17 00:00:00 2001
From: saagit <55336016+saagit@users.noreply.github.com>
Date: Tue, 25 Aug 2020 16:16:34 -0700
Subject: [PATCH 01/36] Update Google fonts to remove unused weight and CSS API
v2.
The 300 weight of Source Code Pro is not used anywhere. This change
also updates to using Google Fonts CSS API v2 and specifying
display=swap to avoid a "flash of invisible text".
Resolves #241
---
templates/base.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/base.html b/templates/base.html
index a43e612..b3f208f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,7 +18,7 @@
{% endif %}
{% if USE_GOOGLE_FONTS != False %}
-
+
{% endif %}
{% if USE_LESS %}
From baf5a16a064e2bc0a36dce5aeb4c0760dec11852 Mon Sep 17 00:00:00 2001
From: Jed Ludlow
Date: Wed, 26 Aug 2020 09:38:58 -0600
Subject: [PATCH 02/36] Place copyright year ahead of copyright name
Traditional placement is to have the year precede the name, so
modifying standard templates to match this.
---
templates/partial/cc_license.html | 2 +-
templates/partial/copyright.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/partial/cc_license.html b/templates/partial/cc_license.html
index 7e2d443..1e05c7c 100644
--- a/templates/partial/cc_license.html
+++ b/templates/partial/cc_license.html
@@ -1,5 +1,5 @@
{% include "partial/flex.html" %}
{% if STATUSCAKE %}
{% include "partial/statuscake.html" %}
From c205163fd7436e2fc42cbe52626425a88c2cbddc Mon Sep 17 00:00:00 2001
From: saagit <55336016+saagit@users.noreply.github.com>
Date: Thu, 27 Aug 2020 19:11:25 -0700
Subject: [PATCH 03/36] Fix compatibility with Pelican 4.5.0 when PLUGINS is
not set in pelicanconf.py
Pelican 4.5.0 changed the plugins mechanism and the default for
PLUGINS is now None. The following type of construct is used in a
number of places in Flex:
{% if 'tipue_search' in PLUGINS %}
If PLUGINS is not set in pelicanconf.py, the following exception will
be triggered under Pelican 4.5.0:
TypeError: argument of type 'NoneType' is not iterable
The Pelican maintainers did not intend the examination of PLUGINS by
templates to be a stable API (per a discussion on IRC). Per their
request, an enhancement request for a mechanism to do this has been
submitted here: https://github.com/getpelican/pelican/issues/2797
This commit changes the problematic constructs in Flex to be in the
style of:
{% if PLUGINS and 'tipue_search' in PLUGINS %}
This allows Flex to work with Pelican 4.5.0 even if users do not
define PLUGINS. Note that to use the new namespace plugins in Pelican
4.5.0, PLUGINS will have to be left at its default of None.
Resolves #245
---
templates/article.html | 2 +-
templates/base.html | 6 +++---
templates/index.html | 2 +-
templates/partial/neighbors.html | 2 +-
templates/search.html | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/article.html b/templates/article.html
index e4aaddd..44d3fe1 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -30,7 +30,7 @@
when=article.locale_date,
category='%s'|format(SITEURL, article.category.url, article.category)|safe) }}
- {% if 'post_stats' in PLUGINS %}
+ {% if PLUGINS and 'post_stats' in PLUGINS %}
• {{ _('%(minutes)s min read', minutes=article.stats['read_mins']) }}
{% endif %}
diff --git a/templates/base.html b/templates/base.html
index b3f208f..10c5400 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -69,7 +69,7 @@
href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/pygments/{{ PYGMENTS_STYLE|default('github') }}.min.css">
{% endif %}
- {% if 'tipue_search' in PLUGINS %}
+ {% if PLUGINS and 'tipue_search' in PLUGINS %}
@@ -156,7 +156,7 @@
{% if SITESUBTITLE %}
{{ SITESUBTITLE }}
{% endif %}
- {% if 'tipue_search' in PLUGINS %}
+ {% if PLUGINS and 'tipue_search' in PLUGINS %}
@@ -280,7 +280,7 @@
{% include 'partial/github.html' %}
{% endif %}
- {% if 'tipue_search' in PLUGINS %}
+ {% if PLUGINS and 'tipue_search' in PLUGINS %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Flex – Archives
-
-
-
-
-
-
-
-
-
-
-
-
-