lucasoskorep/pelican-hyde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Fork Awesome as the default icon font, and rework settings

Browse Source 
In 16e3058, a FONT_AWESOME setting was introduced and used as such:

    "https://kit.fontawesome.com/{{ FONT_AWESOME }}.js"

Also in 16e3058, the default way to fetch Font Awesome was changed to
Javascript (before we used to load is as CSS).

The present commit does several changes:

- Revert the default back to CSS (instead of JS), as I think that for a
  font, there's no need for Javascript. A font is a static asset, so
  it's enough to load it as a static CSS file, both for privacy and
  security. Also, think about those who disable JS in their browser.
- Remove the `FONT_AWESOME` setting, as it's a bit too limiting to force
  users into `kit.fontawesome.com`, it doesn't leave much space for
  configuration.
- Instead, introduce two variables `FONT_AWESOME_CSS` and
  `FONT_AWESOME_JS`, so that users have more freedom to define how they
  want to load the Font Awesome.
- Use Fork Awesome as the default, if no setting is given by user.
  Meaning that we get back to the `fa` css classes (instead of `fas` or
  `fab`)
This commit is contained in:
Arnaud Rebillout
2020-07-26 15:57:40 +07:00
parent 96b87d97d9
commit 000b3370f4
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/base.html
+5 -3
View File
@@ -28,10 +28,12 @@
<link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/hyde.css" />
<link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/syntax.css" />
<link rel="stylesheet" href="https://cdn.rawgit.com/jpswalsh/academicons/master/css/academicons.min.css">
{% if FONT_AWESOME %}
<script src="https://kit.fontawesome.com/{{ FONT_AWESOME }}.js" crossorigin="anonymous"></script>
{% if FONT_AWESOME_JS %}
<script src="{{ FONT_AWESOME_JS }}" crossorigin="anonymous"></script>
{% elif FONT_AWESOME_CSS %}
<link rel="stylesheet" href="{{ FONT_AWESOME_CSS }}" crossorigin="anonymous">
{% else %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/js/all.min.js" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" crossorigin="anonymous">
{% endif %}
<!-- Feeds -->