.drone.yml: Build on Node.js 16

We want to build on LTS or "current" releases only.

See: https://nodejs.org/en/about/releases/

.build.yml

@@ -0,0 +1,15 @@
+image: archlinux
+packages:
+  - nodejs-lts-erbium
+  - npm
+sources:
+  - https://git.sr.ht/~alanorth/hugo-theme-bootstrap4-blog
+tasks:
+  - setup: |
+      id
+      node -v
+      cd hugo-theme-bootstrap4-blog
+      npm install 
+  - test: |
+      cd hugo-theme-bootstrap4-blog
+      npm run build

.drone.yml

@@ -0,0 +1,43 @@
+kind: pipeline
+type: docker
+name: node12
+
+steps:
+- name: build
+  image: node:12-alpine
+  commands:
+  - npm --version
+  - npm install -g npm
+  - npm --version
+  - npm install
+  - npm run build
+
+---
+kind: pipeline
+type: docker
+name: node14
+
+steps:
+- name: build
+  image: node:14-alpine
+  commands:
+  - npm --version
+  - npm install -g npm
+  - npm --version
+  - npm install
+  - npm run build
+
+---
+kind: pipeline
+type: docker
+name: node16
+
+steps:
+- name: build
+  image: node:16-alpine
+  commands:
+  - npm --version
+  - npm install -g npm
+  - npm --version
+  - npm install
+  - npm run build

.travis.yml

@@ -1,10 +0,0 @@
-language: node_js
-node_js:
-  - 6
-  - 8
-  - 9
-script: npm run build
-sudo: false
-dist: trusty
-
-# vim: ts=2 sw=2 et

CHANGELOG.md

@@ -0,0 +1,114 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased Changes
+### Updated
+- Bootstrap v4.6.0, webpack v5.16.0, haven 0.6.2, etc
+
+## [[ 1.6.0 ]] - 2020-12-05
+### Changed
+- Migrate to dart sass from node-sass (see [LibSass is Deprecated](https://sass-lang.com/blog/libsass-is-deprecated))
+- Use new [figure shortcode](https://cpbotha.net/2020/05/02/drop-in-replacement-for-hugo-figure-shortcode-with-responsive-img-srcset/a) that automatically processes images in a post's page bundle to multiple resolutions and outputs an appropriate img srcset (falls back to getting images from static dir)
+
+## [[1.5.1]] - 2020-11-15
+### Updated
+- Minor version bump for bootstrap, node-sass, and fontawesome
+- Update to webpack 5 (brings better tree shaking, reduces fontawesome JS by 8K)
+
+### Fixed
+- JSON-LD keyword formatting @jeremyrcampb #140
+
+### Added
+- Ability to omit date in front matter @jeremyrcampb #141
+
+## [[1.5.0]] - 2020-05-17
+### Updated
+- i18n language keys for German (#dermellor, #131)
+- Boostrap v4.5.0
+- Minor version bump for webpack, node-sass, and fontawesome
+
+### Changed
+- Use Haven for GDPR-compliant popup instead of cookieconsent, which is now
+configured as *opt-in* and does not load Google Analytics or send a hit until
+the user agrees.
+  - Note to translators that some strings have changed, please check:
+    - `cookieAccept`: the string for the "Agree" button
+    - `cookieDecline`: the string for the "Disagree" button
+
+## [[1.4.2]] - 2020-03-22
+### Fixed
+- Encoding of dates in HTML (@alanorth)
+
+## [[1.4.1]] - 2020-03-19
+### Updated
+- npm dependencies: rtlcss 2.5.0, webpack 4.42.0, fontawesome solid icons 5.12.1
+
+### Fixed
+- Fix "Unparsable structured data" error in JSON-LD (@alanorth)
+
+## [[1.4.0]] - 2020-01-28
+### Added
+- Farsi strings for user interface
+
+### Updated
+- bootstrap 4.4.1
+- Fix typo in README.md (@xekon, #118)
+- Font Awesome 5 (make sure you [update](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4) any custom icons you might be using in your content, site layouts, partials, etc).
+
+### Changed
+- Use Hugo's built-in subresource integrity support instead of the generatesri
+tooling that I wrote by hand a few years ago (#120, @alanorth)
+- Use Font Awesome SVGs via JavaScript instead of web fonts (@alanorth)
+- Category and tag links now have a trailing slash (#128, @alanorth)
+
+### Removed
+- Several references to Google Plus (@xekon, #122)
+
+## [[1.3.3]] - 2019-12-02
+### Fixed
+- "Home" link for blogs that are not at the root of the domain (@phofman #115)
+
+### Changed
+- Use "posts" instead of "post" in exampleSite to align closer with Hugo quick start docs (@sboots #117)
+
+### Updated
+- node-sass 4.13.0 and rtlcss 2.4.1
+
+## [[1.3.2]] - 2019-06-20
+### Changed
+- Only list "Regular" pages in recent posts in sidebar (@alanorth)
+- Use absURL instead of baseURL to be more robust with different site configurations (@TommySprat)
+- Quote date in post metadata so it does not get escaped (@TommySprat #111)
+
+## [1.3.1] - 2019-05-05
+### Added
+- SourceHut CI configuration (@alanorth)
+
+### Updated
+- Twitter sharing button (@alanorth)
+- Dependencies in package.json (@alanorth)
+
+## [1.3.0] - 2019-04-22
+### Added
+- Arabic translation (@alanorth)
+- Support for RTL CSS (@alanorth)
+
+### Updated
+- clean-css-cli 4.3.0
+
+## [1.2.1] - 2019-04-14
+### Added
+- Dutch translation #107 (@bit33)
+
+### Removed
+- Google+ icons #108 (@bit33)
+
+### Updated
+- Template functions for Hugo 0.55.0 (@alanorth)
+
+## [1.2.0] - 2019-02-13
+### Updated
+- Bootstrap v4.3.1

LICENSE.txt

@@ -1,674 +1,319 @@
-                    GNU GENERAL PUBLIC LICENSE
+Creative Commons Legal Code
-                       Version 3, 29 June 2007
+
-
+Attribution 3.0 Unported
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- of this license document, but changing it is not allowed.
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-                            Preamble
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
-  The GNU General Public License is a free, copyleft license for
+    DAMAGES RESULTING FROM ITS USE.
-software and other kinds of works.
+
-
+License
-  The licenses for most software and other practical works are designed
+
-to take away your freedom to share and change the works.  By contrast,
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-the GNU General Public License is intended to guarantee your freedom to
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-share and change all versions of a program--to make sure it remains free
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-software for all its users.  We, the Free Software Foundation, use the
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-GNU General Public License for most of our software; it applies also to
+
-any other work released this way by its authors.  You can apply it to
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-your programs, too.
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-  When we speak of free software, we are referring to freedom, not
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-price.  Our General Public Licenses are designed to make sure that you
+CONDITIONS.
-have the freedom to distribute copies of free software (and charge for
+
-them if you wish), that you receive source code or can get it if you
+1. Definitions
-want it, that you can change the software or use pieces of it in new
+
-free programs, and that you know you can do these things.
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
-
+    other pre-existing works, such as a translation, adaptation,
-  To protect your rights, we need to prevent others from denying you
+    derivative work, arrangement of music or other alterations of a
-these rights or asking you to surrender the rights.  Therefore, you have
+    literary or artistic work, or phonogram or performance and includes
-certain responsibilities if you distribute copies of the software, or if
+    cinematographic adaptations or any other form in which the Work may be
-you modify it: responsibilities to respect the freedom of others.
+    recast, transformed, or adapted including in any form recognizably
-
+    derived from the original, except that a work that constitutes a
-  For example, if you distribute copies of such a program, whether
+    Collection will not be considered an Adaptation for the purpose of
-gratis or for a fee, you must pass on to the recipients the same
+    this License. For the avoidance of doubt, where the Work is a musical
-freedoms that you received.  You must make sure that they, too, receive
+    work, performance or phonogram, the synchronization of the Work in
-or can get the source code.  And you must show them these terms so they
+    timed-relation with a moving image ("synching") will be considered an
-know their rights.
+    Adaptation for the purpose of this License.
-
+ b. "Collection" means a collection of literary or artistic works, such as
-  Developers that use the GNU GPL protect your rights with two steps:
+    encyclopedias and anthologies, or performances, phonograms or
-(1) assert copyright on the software, and (2) offer you this License
+    broadcasts, or other works or subject matter other than works listed
-giving you legal permission to copy, distribute and/or modify it.
+    in Section 1(f) below, which, by reason of the selection and
-
+    arrangement of their contents, constitute intellectual creations, in
-  For the developers' and authors' protection, the GPL clearly explains
+    which the Work is included in its entirety in unmodified form along
-that there is no warranty for this free software.  For both users' and
+    with one or more other contributions, each constituting separate and
-authors' sake, the GPL requires that modified versions be marked as
+    independent works in themselves, which together are assembled into a
-changed, so that their problems will not be attributed erroneously to
+    collective whole. A work that constitutes a Collection will not be
-authors of previous versions.
+    considered an Adaptation (as defined above) for the purposes of this
-
+    License.
-  Some devices are designed to deny users access to install or run
+ c. "Distribute" means to make available to the public the original and
-modified versions of the software inside them, although the manufacturer
+    copies of the Work or Adaptation, as appropriate, through sale or
-can do so.  This is fundamentally incompatible with the aim of
+    other transfer of ownership.
-protecting users' freedom to change the software.  The systematic
+ d. "Licensor" means the individual, individuals, entity or entities that
-pattern of such abuse occurs in the area of products for individuals to
+    offer(s) the Work under the terms of this License.
-use, which is precisely where it is most unacceptable.  Therefore, we
+ e. "Original Author" means, in the case of a literary or artistic work,
-have designed this version of the GPL to prohibit the practice for those
+    the individual, individuals, entity or entities who created the Work
-products.  If such problems arise substantially in other domains, we
+    or if no individual or entity can be identified, the publisher; and in
-stand ready to extend this provision to those domains in future versions
+    addition (i) in the case of a performance the actors, singers,
-of the GPL, as needed to protect the freedom of users.
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
-
+    play in, interpret or otherwise perform literary or artistic works or
-  Finally, every program is threatened constantly by software patents.
+    expressions of folklore; (ii) in the case of a phonogram the producer
-States should not allow patents to restrict development and use of
+    being the person or legal entity who first fixes the sounds of a
-software on general-purpose computers, but in those that do, we wish to
+    performance or other sounds; and, (iii) in the case of broadcasts, the
-avoid the special danger that patents applied to a free program could
+    organization that transmits the broadcast.
-make it effectively proprietary.  To prevent this, the GPL assures that
+ f. "Work" means the literary and/or artistic work offered under the terms
-patents cannot be used to render the program non-free.
+    of this License including without limitation any production in the
-
+    literary, scientific and artistic domain, whatever may be the mode or
-  The precise terms and conditions for copying, distribution and
+    form of its expression including digital form, such as a book,
-modification follow.
+    pamphlet and other writing; a lecture, address, sermon or other work
-
+    of the same nature; a dramatic or dramatico-musical work; a
-                       TERMS AND CONDITIONS
+    choreographic work or entertainment in dumb show; a musical
-
+    composition with or without words; a cinematographic work to which are
-  0. Definitions.
+    assimilated works expressed by a process analogous to cinematography;
-
+    a work of drawing, painting, architecture, sculpture, engraving or
-  "This License" refers to version 3 of the GNU General Public License.
+    lithography; a photographic work to which are assimilated works
-
+    expressed by a process analogous to photography; a work of applied
-  "Copyright" also means copyright-like laws that apply to other kinds of
+    art; an illustration, map, plan, sketch or three-dimensional work
-works, such as semiconductor masks.
+    relative to geography, topography, architecture or science; a
-
+    performance; a broadcast; a phonogram; a compilation of data to the
-  "The Program" refers to any copyrightable work licensed under this
+    extent it is protected as a copyrightable work; or a work performed by
-License.  Each licensee is addressed as "you".  "Licensees" and
+    a variety or circus performer to the extent it is not otherwise
-"recipients" may be individuals or organizations.
+    considered a literary or artistic work.
-
+ g. "You" means an individual or entity exercising rights under this
-  To "modify" a work means to copy from or adapt all or part of the work
+    License who has not previously violated the terms of this License with
-in a fashion requiring copyright permission, other than the making of an
+    respect to the Work, or who has received express permission from the
-exact copy.  The resulting work is called a "modified version" of the
+    Licensor to exercise rights under this License despite a previous
-earlier work or a work "based on" the earlier work.
+    violation.
-
+ h. "Publicly Perform" means to perform public recitations of the Work and
-  A "covered work" means either the unmodified Program or a work based
+    to communicate to the public those public recitations, by any means or
-on the Program.
+    process, including by wire or wireless means or public digital
-
+    performances; to make available to the public Works in such a way that
-  To "propagate" a work means to do anything with it that, without
+    members of the public may access these Works from a place and at a
-permission, would make you directly or secondarily liable for
+    place individually chosen by them; to perform the Work to the public
-infringement under applicable copyright law, except executing it on a
+    by any means or process and the communication to the public of the
-computer or modifying a private copy.  Propagation includes copying,
+    performances of the Work, including by public digital performance; to
-distribution (with or without modification), making available to the
+    broadcast and rebroadcast the Work by any means including signs,
-public, and in some countries other activities as well.
+    sounds or images.
-
+ i. "Reproduce" means to make copies of the Work by any means including
-  To "convey" a work means any kind of propagation that enables other
+    without limitation by sound or visual recordings and the right of
-parties to make or receive copies.  Mere interaction with a user through
+    fixation and reproducing fixations of the Work, including storage of a
-a computer network, with no transfer of a copy, is not conveying.
+    protected performance or phonogram in digital form or other electronic
-
+    medium.
-  An interactive user interface displays "Appropriate Legal Notices"
+
-to the extent that it includes a convenient and prominently visible
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-feature that (1) displays an appropriate copyright notice, and (2)
+limit, or restrict any uses free from copyright or rights arising from
-tells the user that there is no warranty for the work (except to the
+limitations or exceptions that are provided for in connection with the
-extent that warranties are provided), that licensees may convey the
+copyright protection under copyright law or other applicable laws.
-work under this License, and how to view a copy of this License.  If
+
-the interface presents a list of user commands or options, such as a
+3. License Grant. Subject to the terms and conditions of this License,
-menu, a prominent item in the list meets this criterion.
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-
+perpetual (for the duration of the applicable copyright) license to
-  1. Source Code.
+exercise the rights in the Work as stated below:
-
+
-  The "source code" for a work means the preferred form of the work
+ a. to Reproduce the Work, to incorporate the Work into one or more
-for making modifications to it.  "Object code" means any non-source
+    Collections, and to Reproduce the Work as incorporated in the
-form of a work.
+    Collections;
-
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
-  A "Standard Interface" means an interface that either is an official
+    including any translation in any medium, takes reasonable steps to
-standard defined by a recognized standards body, or, in the case of
+    clearly label, demarcate or otherwise identify that changes were made
-interfaces specified for a particular programming language, one that
+    to the original Work. For example, a translation could be marked "The
-is widely used among developers working in that language.
+    original work was translated from English to Spanish," or a
-
+    modification could indicate "The original work has been modified.";
-  The "System Libraries" of an executable work include anything, other
+ c. to Distribute and Publicly Perform the Work including as incorporated
-than the work as a whole, that (a) is included in the normal form of
+    in Collections; and,
-packaging a Major Component, but which is not part of that Major
+ d. to Distribute and Publicly Perform Adaptations.
-Component, and (b) serves only to enable use of the work with that
+ e. For the avoidance of doubt:
-Major Component, or to implement a Standard Interface for which an
+
-implementation is available to the public in source code form.  A
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-"Major Component", in this context, means a major essential component
+        which the right to collect royalties through any statutory or
-(kernel, window system, and so on) of the specific operating system
+        compulsory licensing scheme cannot be waived, the Licensor
-(if any) on which the executable work runs, or a compiler used to
+        reserves the exclusive right to collect such royalties for any
-produce the work, or an object code interpreter used to run it.
+        exercise by You of the rights granted under this License;
-
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-  The "Corresponding Source" for a work in object code form means all
+        which the right to collect royalties through any statutory or
-the source code needed to generate, install, and (for an executable
+        compulsory licensing scheme can be waived, the Licensor waives the
-work) run the object code and to modify the work, including scripts to
+        exclusive right to collect such royalties for any exercise by You
-control those activities.  However, it does not include the work's
+        of the rights granted under this License; and,
-System Libraries, or general-purpose tools or generally available free
+   iii. Voluntary License Schemes. The Licensor waives the right to
-programs which are used unmodified in performing those activities but
+        collect royalties, whether individually or, in the event that the
-which are not part of the work.  For example, Corresponding Source
+        Licensor is a member of a collecting society that administers
-includes interface definition files associated with source files for
+        voluntary licensing schemes, via that society, from any exercise
-the work, and the source code for shared libraries and dynamically
+        by You of the rights granted under this License.
-linked subprograms that the work is specifically designed to require,
+
-such as by intimate data communication or control flow between those
+The above rights may be exercised in all media and formats whether now
-subprograms and other parts of the work.
+known or hereafter devised. The above rights include the right to make
-
+such modifications as are technically necessary to exercise the rights in
-  The Corresponding Source need not include anything that users
+other media and formats. Subject to Section 8(f), all rights not expressly
-can regenerate automatically from other parts of the Corresponding
+granted by Licensor are hereby reserved.
-Source.
+
-
+4. Restrictions. The license granted in Section 3 above is expressly made
-  The Corresponding Source for a work in source code form is that
+subject to and limited by the following restrictions:
-same work.
+
-
+ a. You may Distribute or Publicly Perform the Work only under the terms
-  2. Basic Permissions.
+    of this License. You must include a copy of, or the Uniform Resource
-
+    Identifier (URI) for, this License with every copy of the Work You
-  All rights granted under this License are granted for the term of
+    Distribute or Publicly Perform. You may not offer or impose any terms
-copyright on the Program, and are irrevocable provided the stated
+    on the Work that restrict the terms of this License or the ability of
-conditions are met.  This License explicitly affirms your unlimited
+    the recipient of the Work to exercise the rights granted to that
-permission to run the unmodified Program.  The output from running a
+    recipient under the terms of the License. You may not sublicense the
-covered work is covered by this License only if the output, given its
+    Work. You must keep intact all notices that refer to this License and
-content, constitutes a covered work.  This License acknowledges your
+    to the disclaimer of warranties with every copy of the Work You
-rights of fair use or other equivalent, as provided by copyright law.
+    Distribute or Publicly Perform. When You Distribute or Publicly
-
+    Perform the Work, You may not impose any effective technological
-  You may make, run and propagate covered works that you do not
+    measures on the Work that restrict the ability of a recipient of the
-convey, without conditions so long as your license otherwise remains
+    Work from You to exercise the rights granted to that recipient under
-in force.  You may convey covered works to others for the sole purpose
+    the terms of the License. This Section 4(a) applies to the Work as
-of having them make modifications exclusively for you, or provide you
+    incorporated in a Collection, but this does not require the Collection
-with facilities for running those works, provided that you comply with
+    apart from the Work itself to be made subject to the terms of this
-the terms of this License in conveying all material for which you do
+    License. If You create a Collection, upon notice from any Licensor You
-not control copyright.  Those thus making or running the covered works
+    must, to the extent practicable, remove from the Collection any credit
-for you must do so exclusively on your behalf, under your direction
+    as required by Section 4(b), as requested. If You create an
-and control, on terms that prohibit them from making any copies of
+    Adaptation, upon notice from any Licensor You must, to the extent
-your copyrighted material outside their relationship with you.
+    practicable, remove from the Adaptation any credit as required by
-
+    Section 4(b), as requested.
-  Conveying under any other circumstances is permitted solely under
+ b. If You Distribute, or Publicly Perform the Work or any Adaptations or
-the conditions stated below.  Sublicensing is not allowed; section 10
+    Collections, You must, unless a request has been made pursuant to
-makes it unnecessary.
+    Section 4(a), keep intact all copyright notices for the Work and
-
+    provide, reasonable to the medium or means You are utilizing: (i) the
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+    name of the Original Author (or pseudonym, if applicable) if supplied,
-
+    and/or if the Original Author and/or Licensor designate another party
-  No covered work shall be deemed part of an effective technological
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
-measure under any applicable law fulfilling obligations under article
+    attribution ("Attribution Parties") in Licensor's copyright notice,
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+    terms of service or by other reasonable means, the name of such party
-similar laws prohibiting or restricting circumvention of such
+    or parties; (ii) the title of the Work if supplied; (iii) to the
-measures.
+    extent reasonably practicable, the URI, if any, that Licensor
-
+    specifies to be associated with the Work, unless such URI does not
-  When you convey a covered work, you waive any legal power to forbid
+    refer to the copyright notice or licensing information for the Work;
-circumvention of technological measures to the extent such circumvention
+    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-is effected by exercising rights under this License with respect to
+    a credit identifying the use of the Work in the Adaptation (e.g.,
-the covered work, and you disclaim any intention to limit operation or
+    "French translation of the Work by Original Author," or "Screenplay
-modification of the work as a means of enforcing, against the work's
+    based on original Work by Original Author"). The credit required by
-users, your or third parties' legal rights to forbid circumvention of
+    this Section 4 (b) may be implemented in any reasonable manner;
-technological measures.
+    provided, however, that in the case of a Adaptation or Collection, at
-
+    a minimum such credit will appear, if a credit for all contributing
-  4. Conveying Verbatim Copies.
+    authors of the Adaptation or Collection appears, then as part of these
-
+    credits and in a manner at least as prominent as the credits for the
-  You may convey verbatim copies of the Program's source code as you
+    other contributing authors. For the avoidance of doubt, You may only
-receive it, in any medium, provided that you conspicuously and
+    use the credit required by this Section for the purpose of attribution
-appropriately publish on each copy an appropriate copyright notice;
+    in the manner set out above and, by exercising Your rights under this
-keep intact all notices stating that this License and any
+    License, You may not implicitly or explicitly assert or imply any
-non-permissive terms added in accord with section 7 apply to the code;
+    connection with, sponsorship or endorsement by the Original Author,
-keep intact all notices of the absence of any warranty; and give all
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
-recipients a copy of this License along with the Program.
+    use of the Work, without the separate, express prior written
-
+    permission of the Original Author, Licensor and/or Attribution
-  You may charge any price or no price for each copy that you convey,
+    Parties.
-and you may offer support or warranty protection for a fee.
+ c. Except as otherwise agreed in writing by the Licensor or as may be
-
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
-  5. Conveying Modified Source Versions.
+    Publicly Perform the Work either by itself or as part of any
-
+    Adaptations or Collections, You must not distort, mutilate, modify or
-  You may convey a work based on the Program, or the modifications to
+    take other derogatory action in relation to the Work which would be
-produce it from the Program, in the form of source code under the
+    prejudicial to the Original Author's honor or reputation. Licensor
-terms of section 4, provided that you also meet all of these conditions:
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-
+    of the right granted in Section 3(b) of this License (the right to
-    a) The work must carry prominent notices stating that you modified
+    make Adaptations) would be deemed to be a distortion, mutilation,
-    it, and giving a relevant date.
+    modification or other derogatory action prejudicial to the Original
-
+    Author's honor and reputation, the Licensor will waive or not assert,
-    b) The work must carry prominent notices stating that it is
+    as appropriate, this Section, to the fullest extent permitted by the
-    released under this License and any conditions added under section
+    applicable national law, to enable You to reasonably exercise Your
-    7.  This requirement modifies the requirement in section 4 to
+    right under Section 3(b) of this License (right to make Adaptations)
-    "keep intact all notices".
+    but not otherwise.
-
+
-    c) You must license the entire work, as a whole, under this
+5. Representations, Warranties and Disclaimer
-    License to anyone who comes into possession of a copy.  This
+
-    License will therefore apply, along with any applicable section 7
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-    additional terms, to the whole of the work, and all its parts,
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-    regardless of how they are packaged.  This License gives no
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-    permission to license the work in any other way, but it does not
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-    invalidate such permission if you have separately received it.
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-    d) If the work has interactive user interfaces, each must display
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-    Appropriate Legal Notices; however, if the Program has interactive
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-    interfaces that do not display Appropriate Legal Notices, your
+
-    work need not make them do so.
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-  A compilation of a covered work with other separate and independent
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-works, which are not by their nature extensions of the covered work,
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-and which are not combined with it such as to form a larger program,
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-in or on a volume of a storage or distribution medium, is called an
+
-"aggregate" if the compilation and its resulting copyright are not
+7. Termination
-used to limit the access or legal rights of the compilation's users
+
-beyond what the individual works permit.  Inclusion of a covered work
+ a. This License and the rights granted hereunder will terminate
-in an aggregate does not cause this License to apply to the other
+    automatically upon any breach by You of the terms of this License.
-parts of the aggregate.
+    Individuals or entities who have received Adaptations or Collections
-
+    from You under this License, however, will not have their licenses
-  6. Conveying Non-Source Forms.
+    terminated provided such individuals or entities remain in full
-
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-  You may convey a covered work in object code form under the terms
+    survive any termination of this License.
-of sections 4 and 5, provided that you also convey the
+ b. Subject to the above terms and conditions, the license granted here is
-machine-readable Corresponding Source under the terms of this License,
+    perpetual (for the duration of the applicable copyright in the Work).
-in one of these ways:
+    Notwithstanding the above, Licensor reserves the right to release the
-
+    Work under different license terms or to stop distributing the Work at
-    a) Convey the object code in, or embodied in, a physical product
+    any time; provided, however that any such election will not serve to
-    (including a physical distribution medium), accompanied by the
+    withdraw this License (or any other license that has been, or is
-    Corresponding Source fixed on a durable physical medium
+    required to be, granted under the terms of this License), and this
-    customarily used for software interchange.
+    License will continue in full force and effect unless terminated as
-
+    stated above.
-    b) Convey the object code in, or embodied in, a physical product
+
-    (including a physical distribution medium), accompanied by a
+8. Miscellaneous
-    written offer, valid for at least three years and valid for as
+
-    long as you offer spare parts or customer support for that product
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    model, to give anyone who possesses the object code either (1) a
+    the Licensor offers to the recipient a license to the Work on the same
-    copy of the Corresponding Source for all the software in the
+    terms and conditions as the license granted to You under this License.
-    product that is covered by this License, on a durable physical
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    medium customarily used for software interchange, for a price no
+    offers to the recipient a license to the original Work on the same
-    more than your reasonable cost of physically performing this
+    terms and conditions as the license granted to You under this License.
-    conveying of source, or (2) access to copy the
+ c. If any provision of this License is invalid or unenforceable under
-    Corresponding Source from a network server at no charge.
+    applicable law, it shall not affect the validity or enforceability of
-
+    the remainder of the terms of this License, and without further action
-    c) Convey individual copies of the object code with a copy of the
+    by the parties to this agreement, such provision shall be reformed to
-    written offer to provide the Corresponding Source.  This
+    the minimum extent necessary to make such provision valid and
-    alternative is allowed only occasionally and noncommercially, and
+    enforceable.
-    only if you received the object code with such an offer, in accord
+ d. No term or provision of this License shall be deemed waived and no
-    with subsection 6b.
+    breach consented to unless such waiver or consent shall be in writing
-
+    and signed by the party to be charged with such waiver or consent.
-    d) Convey the object code by offering access from a designated
+ e. This License constitutes the entire agreement between the parties with
-    place (gratis or for a charge), and offer equivalent access to the
+    respect to the Work licensed here. There are no understandings,
-    Corresponding Source in the same way through the same place at no
+    agreements or representations with respect to the Work not specified
-    further charge.  You need not require recipients to copy the
+    here. Licensor shall not be bound by any additional provisions that
-    Corresponding Source along with the object code.  If the place to
+    may appear in any communication from You. This License may not be
-    copy the object code is a network server, the Corresponding Source
+    modified without the mutual written agreement of the Licensor and You.
-    may be on a different server (operated by you or a third party)
+ f. The rights granted under, and the subject matter referenced, in this
-    that supports equivalent copying facilities, provided you maintain
+    License were drafted utilizing the terminology of the Berne Convention
-    clear directions next to the object code saying where to find the
+    for the Protection of Literary and Artistic Works (as amended on
-    Corresponding Source.  Regardless of what server hosts the
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Corresponding Source, you remain obligated to ensure that it is
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    available for as long as needed to satisfy these requirements.
+    and the Universal Copyright Convention (as revised on July 24, 1971).
-
+    These rights and subject matter take effect in the relevant
-    e) Convey the object code using peer-to-peer transmission, provided
+    jurisdiction in which the License terms are sought to be enforced
-    you inform other peers where the object code and Corresponding
+    according to the corresponding provisions of the implementation of
-    Source of the work are being offered to the general public at no
+    those treaty provisions in the applicable national law. If the
-    charge under subsection 6d.
+    standard suite of rights granted under applicable copyright law
-
+    includes additional rights not granted under this License, such
-  A separable portion of the object code, whose source code is excluded
+    additional rights are deemed to be included in the License; this
-from the Corresponding Source as a System Library, need not be
+    License is not intended to restrict the license of any rights under
-included in conveying the object code work.
+    applicable law.
-
+
-  A "User Product" is either (1) a "consumer product", which means any
+
-tangible personal property which is normally used for personal, family,
+Creative Commons Notice
-or household purposes, or (2) anything designed or sold for incorporation
+
-into a dwelling.  In determining whether a product is a consumer product,
+    Creative Commons is not a party to this License, and makes no warranty
-doubtful cases shall be resolved in favor of coverage.  For a particular
+    whatsoever in connection with the Work. Creative Commons will not be
-product received by a particular user, "normally used" refers to a
+    liable to You or any party on any legal theory for any damages
-typical or common use of that class of product, regardless of the status
+    whatsoever, including without limitation any general, special,
-of the particular user or of the way in which the particular user
+    incidental or consequential damages arising in connection to this
-actually uses, or expects or is expected to use, the product.  A product
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
-is a consumer product regardless of whether the product has substantial
+    Commons has expressly identified itself as the Licensor hereunder, it
-commercial, industrial or non-consumer uses, unless such uses represent
+    shall have all rights and obligations of Licensor.
-the only significant mode of use of the product.
+
-
+    Except for the limited purpose of indicating to the public that the
-  "Installation Information" for a User Product means any methods,
+    Work is licensed under the CCPL, Creative Commons does not authorize
-procedures, authorization keys, or other information required to install
+    the use by either party of the trademark "Creative Commons" or any
-and execute modified versions of a covered work in that User Product from
+    related trademark or logo of Creative Commons without the prior
-a modified version of its Corresponding Source.  The information must
+    written consent of Creative Commons. Any permitted use will be in
-suffice to ensure that the continued functioning of the modified object
+    compliance with Creative Commons' then-current trademark usage
-code is in no case prevented or interfered with solely because
+    guidelines, as may be published on its website or otherwise made
-modification has been made.
+    available upon request from time to time. For the avoidance of doubt,
-
+    this trademark restriction does not form part of this License.
-  If you convey an object code work under this section in, or with, or
+
-specifically for use in, a User Product, and the conveying occurs as
+    Creative Commons may be contacted at https://creativecommons.org/.
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,4 +1,4 @@
-# Hugo Bootstrap v4 Blog [![Build Status](https://travis-ci.org/alanorth/hugo-theme-bootstrap4-blog.svg?branch=master)](https://travis-ci.org/alanorth/hugo-theme-bootstrap4-blog)
+# Hugo Bootstrap v4 Blog [![Build Status](https://ci.mjanja.ch/api/badges/alanorth/hugo-theme-bootstrap4-blog/status.svg)](https://ci.mjanja.ch/alanorth/hugo-theme-bootstrap4-blog) [![builds.sr.ht status](https://builds.sr.ht/~alanorth/hugo-theme-bootstrap4-blog.svg)](https://builds.sr.ht/~alanorth/hugo-theme-bootstrap4-blog?)
 A simple but opinionated [Hugo](https://gohugo.io) theme geared towards blog-style content. Based on the older two-column [Bootstrap blog example](https://v4-alpha.getbootstrap.com/examples/blog/) that was used for several Bootstrap versions, but has now been retired in favor of a "snarky" (their words) new example as of version [4.0.0's final release](https://blog.getbootstrap.com/2018/01/18/bootstrap-4/).
 
 ![Screenshot](https://raw.githubusercontent.com/alanorth/hugo-theme-bootstrap4-blog/master/screenshot.png "Screenshot")
@@ -11,14 +11,14 @@ See [picturingjordan.com](https://picturingjordan.com) for an example of this th
 - Uses Bootstrap v4's [native system font stack](https://getbootstrap.com/docs/4.0/content/reboot/#native-font-stack) to load quickly and look good on all platforms
 - Excellent [structured data](https://developers.google.com/search/docs/guides/intro-structured-data) (JSON-LD), [OpenGraph](http://ogp.me), and [Twitter Card](https://dev.twitter.com/cards/types) metadata support
 - robots.txt linking to XML sitemap (disabled by default, see [Hugo docs](https://gohugo.io/extras/robots-txt/))
-- Basic support for [multi-lingual content](https://gohugo.io/content-management/multilingual/) (added in Hugo 0.17) and user interface translation (i18n)
+- Basic support for [multi-lingual content](https://gohugo.io/content-management/multilingual/) (added in Hugo 0.17) and user interface translation (i18n), including RTL languages like Arabic and Farsi
 - Supports Google, Bing, and Yandex site verification via meta tags
-- Supports Google Analytics (async version), see [Hugo docs](https://gohugo.io/extras/analytics/)
+- Supports GDPR-compliant Google Analytics (script is not even loaded until *after* the user agrees) with configurable consent banner, see [`exampleSite/config.toml`](https://github.com/alanorth/hugo-theme-bootstrap4-blog/blob/master/exampleSite/config.toml)
 - Supports Disqus comments, see [Hugo docs](https://gohugo.io/extras/comments/)
-- Can show a message about cookie usage to the user, see [`exampleSite/config.toml`](https://github.com/alanorth/hugo-theme-bootstrap4-blog/blob/master/exampleSite/config.toml)
+- Allow addition of custom `<head>` code in site's `layouts/partials/head-custom.html` (see [#17](https://github.com/alanorth/hugo-theme-bootstrap4-blog/pull/17))
-- Allow addition of custom `<head>` code in site's `layouts/partial/head-custom.html` (see [#17](https://github.com/alanorth/hugo-theme-bootstrap4-blog/pull/17))
 - Configurable display of summaries of content in list templates.
-- configurable keywords for every post
+- Configurable keywords for every post
+- Supports automatic generation of `<img>` srcsets for images in [page bundles](https://gohugo.io/content-management/page-bundles/) using a [new figure shortcode](https://cpbotha.net/2020/05/02/drop-in-replacement-for-hugo-figure-shortcode-with-responsive-img-srcset/) (falls back to default Hugo behavior of looking up images in the static directory)
 
 ## Usage
 Clone the repository to your site's `themes` directory. Refer to [`exampleSite/config.toml`](https://github.com/alanorth/hugo-theme-bootstrap4-blog/blob/master/exampleSite/config.toml) for recommended configuration values.
@@ -38,7 +38,7 @@ A few suggestions to help you get a good looking site quickly:
 See the source code and structure of [picturingjordan.com](https://github.com/alanorth/picturingjordan.com) to get more ideas.
 
 ## Building (For Developers)
-This theme uses the [Bootstrap](https://getbootstrap.com/) framework. A static version of this is already included, but if you want to bump the version, tweak the style, etc, you'll need to rebuild the assets. Make sure you have NodeJS >= v6 installed, and then run the following from inside the theme's directory:
+This theme uses the [Bootstrap](https://getbootstrap.com/) framework. A static version of this is already included, but if you want to bump the version, tweak the style, etc, you'll need to rebuild the assets. Make sure you have NodeJS >= v10 installed, and then run the following from inside the theme's directory:
 
 ```console
 $ npm install
@@ -53,6 +53,4 @@ There are several ways to help with the development of the theme:
 - Fork [the repository](https://github.com/alanorth/hugo-theme-bootstrap4-blog) on GitHub, add features on a "feature" branch like `update-bootstrap`, and then send a [pull request](https://github.com/alanorth/hugo-theme-bootstrap4-blog/compare) with your changes
 
 ## License
-This repository contains the code of [Bootstrap](http://getbootstrap.com), which is licensed under the [MIT license](https://tldrlegal.com/license/mit-license), and [Font Awesome](http://fontawesome.io/), which uses [various licenses](http://fontawesome.io/license/).
+This repository contains SASS and HTML code from the [Bootstrap](https://getbootstrap.com) project, which is licensed under the [MIT license](https://tldrlegal.com/license/mit-license) and [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/), and [Font Awesome](https://fontawesome.com/), which uses [various licenses](https://fontawesome.com/license/).
-
-Otherwise, the contents are [GPLv3](https://www.gnu.org/licenses/gpl-3.0.txt).

build/assets.json

@@ -1,5 +0,0 @@
-{
-  "style": "static/css/style.css",
-  "cookieconsentcss": "static/css/cookieconsent.min.css",
-  "cookieconsentjs": "static/js/cookieconsent.min.js"
-}

build/sri.js

@@ -1,23 +0,0 @@
-// Adapted from: https://gist.github.com/jmervine/ae1bace0fe37dce75b90ec3e9592771c
-
-var crypto = require('crypto');
-var fs     = require('fs');
-var assets = require('./assets.json');
-
-var generate384 = function (file) {
-  var enc  = 'utf8';
-  var body = fs.readFileSync(file, { encoding: enc });
-  var hash = crypto.createHash('sha384').update(body, enc);
-  var sha  = hash.digest('base64');
-
-  return 'sha384-' + sha;
-}
-
-for (var asset in assets) {
-  var path = assets[asset];
-  var hash = generate384(path);
-
-  console.log(asset + ' = "' + hash + '"');
-}
-
-// vim: set ts=2 sw=2 et:

data/sri.toml

@@ -1,3 +0,0 @@
-style = "sha384-6+EGfPoOzk/n2DVJSlglKT8TV1TgIMvVcKI73IZgBswLasPBn94KommV6ilJqCXE"
-cookieconsentcss = "sha384-Ul1H8jNudxII4JYT6VbQzsJj2XTAqp3zPv1YJwsTd19vCwtNBq+dgWS3DHuulhVe"
-cookieconsentjs = "sha384-MUoyijeybCtm4GFBhubnlrS2TscWkBDFkwCzXMofOGhiTYxVzoSfwaCM7HtNFzwN"

exampleSite/config.toml

@@ -6,13 +6,15 @@ title = "Hugo Bootstrap v4 Blog"
 theme = "hugo-theme-bootstrap4-blog"
 # number of posts to show on home/category/tag pages (Default: 10)
 paginate = 5
+# number of words to use for summary on home/category/tag pages (Default: 70)
+summaryLength = 50
 # optionally override the site's footer with custom copyright text
 # copyright = "Except where otherwise noted, content on this site is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)."
 #googleAnalytics = "UA-123-45"
 #disqusShortname = "XYW"
 
 [permalinks]
-  post = "/:year/:month/:title/"
+  posts = "/:year/:month/:title/"
   page = "/:slug/"
 
 [[menu.sidebar]]
@@ -37,6 +39,9 @@ paginate = 5
   # Description/subtitle for homepage (can be Markdown)
   description = "A simple Hugo theme based on the Bootstrap v4 blog example."
 
+  # Show header (default: true)
+  #header_visible = true
+
   # Format dates with Go's time formatting
   date_format = "Mon Jan 02, 2006"
 
@@ -86,5 +91,7 @@ paginate = 5
 # Languages to render
 #[languages.en]
 #[languages.bg]
+  # Bulgarian date format is dd.mm.yyyy
+  #date_format = "02.01.2006"
 
 # vim: ts=2 sw=2 et

i18n/ar.yaml

@@ -0,0 +1,47 @@
+- id: about
+  translation: "عن المُدَوَّنَة"
+
+- id: home
+  translation: "الصَّفْحَة الرَّئيسِيَّة"
+
+- id: recentPosts
+  translation: "المَنْشورات الأَخِيرَة"
+
+- id: readMore
+  translation: "قِرَاءَة المَزِيد ←"
+
+- id: translations
+  translation: "تَرْجَمَة"
+
+- id: share
+  translation: "شَارِك"
+
+- id: paginatorPrevious
+  translation: "الصَّفْحَة السَّابِقَة"
+
+- id: paginatorNext
+  translation: "الصَّفْحَة التَّالِيَة"
+
+- id: cookieMessage
+  translation: "هذا المَوْقِع يَسْتَخْدِم مَلَفَّات كُوكِيز"
+
+- id: cookieLink
+  translation: ".اعْرَف أَكْثَر"
+
+- id: cookieAccept
+  translation: "!أُوَافِق"
+
+- id: backToTop
+  translation: "العَوْدَة إِلَى الاَعْلَى"
+
+- id: links
+  translation: "الرَِّوَابِط"
+
+- id: authoredBy
+  translation: "الكاتب"
+
+- id: postedIn
+  translation: "في"
+
+- id: comma
+  translation: "،"

i18n/bg.yaml

@@ -28,11 +28,20 @@
 - id: cookieLink
   translation: "Научете повече."
 
-- id: cookieDismiss
+- id: cookieAccept
-  translation: "Разбрах!"
+  translation: "Съгласен съм"
+
+- id: cookieDecline
+  translation: "Не съм съгласен"
 
 - id: backToTop
   translation: "Нагоре"
 
 - id: links
   translation: "Линкове"
+
+- id: authoredBy
+  translation: "от"
+
+- id: postedIn
+  translation: "в"

i18n/de.yaml

@@ -28,11 +28,17 @@
 - id: cookieLink
   translation: "Weitere Informationen"
 
-- id: cookieDismiss
+- id: cookieDecline
-  translation: "OK"
+  translation: "Nicht zustimmen"
 
 - id: backToTop
   translation: "Zurück zum Anfang"
 
 - id: links
   translation: "Links"
+  
+- id: authoredBy
+  translation: "von"
+
+- id: postedIn
+  translation: "in"

i18n/en.yaml

@@ -28,11 +28,23 @@
 - id: cookieLink
   translation: "Learn more."
 
-- id: cookieDismiss
+- id: cookieAccept
-  translation: "Got it!"
+  translation: "Agree"
+
+- id: cookieDecline
+  translation: "Disagree"
 
 - id: backToTop
   translation: "Back to top"
 
 - id: links
   translation: "Links"
+
+- id: authoredBy
+  translation: "by"
+
+- id: postedIn
+  translation: "in"
+
+- id: comma
+  translation: ","

i18n/es.yaml

@@ -28,7 +28,7 @@
 - id: cookieLink
   translation: "Leer más."
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "Comprendido!"
 
 - id: backToTop

i18n/fa.yaml

@@ -0,0 +1,47 @@
+- id: about
+  translation: "درباره من"
+
+- id: home
+  translation: "صفحه اصلی"
+
+- id: recentPosts
+  translation: "مطالب تازه"
+
+- id: readMore
+  translation: "بیشتر بخوانید ←"
+
+- id: translations
+  translation: "ترجمه"
+
+- id: share
+  translation: "به اشتراک گذاشتن"
+
+- id: paginatorPrevious
+  translation: "صفحه قبلی"
+
+- id: paginatorNext
+  translation: "صفحه بعدی"
+
+- id: cookieMessage
+  translation: "در این سایت از کوکیز استفاده میشود"
+
+- id: cookieLink
+  translation: ".بیشتر بدانید"
+
+- id: cookieAccept
+  translation: "!متوجه شدم"
+
+- id: backToTop
+  translation: "برگشت به بالا"
+
+- id: links
+  translation: "لینکها"
+
+- id: authoredBy
+  translation: "بوسیله"
+
+- id: postedIn
+  translation: "در"
+
+- id: comma
+  translation: "،"

i18n/fr.yaml

@@ -28,7 +28,7 @@
 - id: cookieLink
   translation: "En savoir plus."
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "J'ai compris !"
 
 - id: backToTop

i18n/id.yaml

@@ -28,7 +28,7 @@
 - id: cookieLink
   translation: "Pelajari"
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "Paham!"
 
 - id: backToTop

i18n/nl.yaml

@@ -0,0 +1,38 @@
+- id: about
+  translation: "Over ons"
+
+- id: home
+  translation: "Home"
+
+- id: recentPosts
+  translation: "Recente berichten"
+
+- id: readMore
+  translation: "Lees verder →"
+
+- id: translations
+  translation: "Vertalingen"
+
+- id: share
+  translation: "Delen"
+
+- id: paginatorPrevious
+  translation: "Vorige pagina"
+
+- id: paginatorNext
+  translation: "Volgende pagina"
+
+- id: cookieMessage
+  translation: "Deze website gebruikt cookies."
+
+- id: cookieLink
+  translation: "Lees hier meer"
+
+- id: cookieAccept
+  translation: "OK"
+
+- id: backToTop
+  translation: "Terug naar boven"
+
+- id: links
+  translation: "Links"

i18n/no.yaml

@@ -28,7 +28,7 @@
 - id: cookieLink
   translation: "Lær mer."
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "Greit!"
 
 - id: backToTop

i18n/pt.yaml

@@ -28,5 +28,5 @@
 - id: cookieLink
   translation: "Saiba mais."
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "Ok!"

i18n/zh-Hant-TW.yaml

@@ -28,7 +28,7 @@
 - id: cookieLink
   translation: "進一步瞭解。"
 
-- id: cookieDismiss
+- id: cookieAccept
   translation: "知道了！"
 
 - id: backToTop

layouts/_default/baseof.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Lang }}">
+<html lang="{{ .Lang }}" {{ if or (eq .Lang "ar") (eq .Lang "fa") }}dir="rtl"{{ end }}>
 
   <head>
     {{ partial "head-meta.html" . }}
@@ -12,17 +12,26 @@
 
     <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 
+    {{ if or (eq .Lang "ar") (eq .Lang "fa") }}
+    {{ "<!-- RTL -->" | safeHTML }}
+    {{ $styleRtl := resources.Get "css/style.rtl.css" | resources.Fingerprint }}
+    <link href="{{ $styleRtl.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $styleRtl.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
+    {{ else }}
     {{ "<!-- combined, minified CSS -->" | safeHTML }}
-    <link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.style}}" crossorigin="anonymous"{{ end }}>
+    {{ $style := resources.Get "css/style.css" | resources.Fingerprint }}
-
+    <link href="{{ $style.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $style.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
-    {{ if .RSSLink }}
-    {{ "<!-- RSS 2.0 feed -->" | safeHTML }}
-    <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
     {{ end }}
 
-    {{ template "_internal/google_analytics_async.html" . }}
+    {{ "<!-- minified Font Awesome for SVG icons -->" | safeHTML }}
+    {{ $fontawesome := resources.Get "js/fontawesome.min.js" | resources.Fingerprint }}
+    <script defer src="{{ $fontawesome.Permalink }}" integrity="{{ $fontawesome.Data.Integrity }}" crossorigin="anonymous"></script>
 
-    {{ if .Site.Params.cookie_consent_info_url }}
+    {{ "<!-- RSS 2.0 feed -->" | safeHTML }}
+    {{ with .OutputFormats.Get "rss" -}}
+      {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+    {{ end -}}
+
+    {{ if .Site.GoogleAnalytics }}
     {{ partial "cookie-consent.html" . }}
     {{ end }}
 
@@ -47,13 +56,15 @@
     {{ end }}
 
     {{ block "header" . }}
+    {{ if (ne .Site.Params.header_visible false) }}
     <header class="blog-header">
       <div class="container">
-        <h1 class="blog-title"><a href="{{ .Site.BaseURL }}" rel="home">{{ .Site.Title | safeHTML }}</a></h1>
+        <h1 class="blog-title" dir="auto"><a href="{{ .Site.BaseURL | absURL }}" rel="home">{{ .Site.Title | safeHTML }}</a></h1>
-        {{ if .Site.Params.description }}<p class="lead blog-description">{{ .Site.Params.description | markdownify }}</p>{{ end }}
+        {{ if .Site.Params.description }}<p class="lead blog-description" dir="auto">{{ .Site.Params.description | markdownify }}</p>{{ end }}
       </div>
     </header>
     {{ end }}
+    {{ end }}
 
     {{ block "body" . }}
     <div class="container">
@@ -74,7 +85,7 @@
 
     {{ block "footer" . }}
     <footer class="blog-footer">
-      <p>
+      <p dir="auto">
       {{ if .Site.Copyright }}
       {{ .Site.Copyright | markdownify }}
       {{ else }}

layouts/_default/content.html

@@ -2,8 +2,8 @@
 
 <article class="blog-post">
   <header>
-    <h2 class="blog-post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
+    <h2 class="blog-post-title" dir="auto"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
-    <p class="blog-post-meta"><time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format $dateFormat }}</time> by {{ .Params.author | default .Site.Params.author }}{{ if or (.Params.categories) (.Params.tags) }} in {{ partial "meta-terms.html" . }}{{ end }}</p>
+    <p class="blog-post-meta"><time {{ .Date.Format "2006-01-02T15:04:05Z07:00" | printf "datetime=%q" | safeHTMLAttr }}>{{ .Date.Format $dateFormat }}</time> {{ i18n "authoredBy" }} {{ .Params.author | default .Site.Params.author }}{{ if or (.Params.categories) (.Params.tags) }} {{ i18n "postedIn" }} {{ partial "meta-terms.html" . }}{{ end }}</p>
   </header>
   {{ .Content }}
 </article> <!-- /.blog-post -->

layouts/_default/list.html

@@ -4,24 +4,22 @@
   "@context": "http://schema.org",
   "@type": "Blog",
   {{- /* Google recommends the headline be no more than 110 characters */}}
-  "headline": "{{ substr .Site.Title 0 110 }}",
+  "headline": {{ substr .Site.Title 0 110 }},
-  "url" : "{{ printf "%s" .Permalink }}",
+  "url" : {{ printf "%s" .Permalink }},
   "author": {
     "@type": "Person",
-    "name": "{{ .Site.Params.author }}"
+    "name": {{ .Site.Params.author }}
   },
   {{- $ISO8601 := "2006-01-02T15:04:05-07:00" }}
   {{- if not .Date.IsZero }}
-  "dateModified": "{{ .Date.Format $ISO8601 }}",
+  "dateModified": {{ .Date.Format $ISO8601 }},
-  {{- end }}
-  {{- with .Site.Social.GooglePlus }}
-  "publisher": "{{ printf "%s" . }}",
   {{- end }}
   {{- /* all of the site's categories/tags, from Hugo's tpl/template_embedded.go */}}
-  "keywords": "{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}"
+  {{- $keywords := slice }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ $keywords = $keywords | append $term }}{{ end }}{{ end }}
+  "keywords": {{ delimit $keywords ", " }} 
   {{- with .Site.Params.description -}}
   ,
-  "description": "{{- . -}}"
+  "description": {{- . -}}
   {{- end }}
 }
 </script>
@@ -30,7 +28,7 @@
 {{ define "main" }}
 
 {{ $truncate := default true .Site.Params.truncate }}
-{{ $paginator := .Paginate (where .Site.Pages "Section" "in" .Site.Params.mainSections) }}
+{{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
 {{ range $paginator.Pages }}
 {{ if $truncate }}
 {{ .Render "summary" }}

layouts/_default/single.html

@@ -6,47 +6,54 @@
   "@context": "http://schema.org",
   "@type": "BlogPosting",
   {{- /* Google recommends the headline be no more than 110 characters */}}
-  "headline": "{{ substr .Title 0 110 }}",
+  "headline": {{ substr .Title 0 110 }},
-  {{- with .Params.images -}}{{ range first 1 . }}
+  {{- with .Params.images -}}{{- range first 1 . -}}
+  {{/* try to get the image from the page bundle */}}
+  {{- with $.Page.Resources.GetMatch (printf "*%s*" .) }}
   "image": {
     "@type": "ImageObject",
-    "url": "{{ . | absURL }}"
+    "url": {{ .Permalink }},
+    "height": "{{ .Height }}",
+    "width": "{{ .Width }}"
+  {{/* otherwise, get the image from static */}}
+  {{- else }}
+  "image": {
+    "@type": "ImageObject",
+    {{- $image := . -}}
     {{- /* Don't try to get imageConfig if image param is not local */ -}}
     {{- if not (or (hasPrefix . "http://") (hasPrefix . "https://")) -}}
-    {{- with (imageConfig (printf "/static/%s" .)) -}}
+    {{- with (imageConfig (printf "/static/%s" .)) }}
-    ,
+    "url": {{ $image | absURL }},
     "height": "{{ .Height }}",
     "width": "{{ .Width }}"
     {{- end -}}
-    {{ end }}
+    {{- end -}}
+  {{ end }}
   },
   {{- end -}}{{ end }}
-  "url": "{{ printf "%s" .Permalink }}",
+  "url": {{ printf "%s" .Permalink }},
   "wordCount": "{{ .WordCount }}",
   {{- $ISO8601 := "2006-01-02T15:04:05-07:00" }}
   {{- if not .PublishDate.IsZero }}
-  "datePublished": "{{ .PublishDate.Format $ISO8601 }}",
+  "datePublished": {{ .PublishDate.Format $ISO8601 }},
   {{- else }}
-  "datePublished": "{{ .Date.Format $ISO8601 }}",
+  "datePublished": {{ .Date.Format $ISO8601 }},
   {{- end }}
   {{- if not .Lastmod.IsZero }}
-  "dateModified": "{{ .Lastmod.Format $ISO8601 }}",
+  "dateModified": {{ .Lastmod.Format $ISO8601 }},
-  {{- end }}
-  {{- with .Site.Social.GooglePlus }}
-  "publisher": "{{ printf "%s" . }}",
   {{- end }}
   "author": {
     "@type": "Person",
-    "name": "{{ .Params.author | default .Site.Params.author }}"
+    "name": {{ .Params.author | default .Site.Params.author }}
   }
   {{- if or (.Params.keywords) (or (.Params.categories) (.Params.tags)) -}}
   ,
-  "keywords": "{{ delimit (union .Params.keywords (union .Params.categories .Params.tags)) ", " }}"
+  "keywords": {{ delimit (union .Params.keywords (union .Params.categories .Params.tags)) ", " }}
   {{- end }}
 
   {{- with .Params.description -}}
   ,
-  "description": "{{ . }}"
+  "description": {{ . }}
   {{- end }}
 }
 </script>
@@ -58,8 +65,10 @@
 
 <article class="blog-post">
   <header>
-    <h2 class="blog-post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
+    <h2 class="blog-post-title" dir="auto"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
-    <p class="blog-post-meta"><time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format $dateFormat }}</time> by {{ .Params.author | default .Site.Params.author }}{{ if or (.Params.categories) (.Params.tags) }} in {{ partial "meta-terms.html" . }}{{ end }}</p>
+    <p class="blog-post-meta">
+{{ if not .PublishDate.IsZero }}<time {{ .Date.Format "2006-01-02T15:04:05Z07:00" | printf "datetime=%q" | safeHTMLAttr }}>{{ .Date.Format $dateFormat }}</time>{{ end }}
+{{ if or (.Params.categories) (.Params.tags) }} {{ i18n "postedIn" }} {{ partial "meta-terms.html" . }}{{ end }}</p>
   </header>
   {{ .Content }}
 

layouts/_default/summary.html

@@ -2,8 +2,8 @@
 
 <article class="blog-post">
   <header>
-    <h2 class="blog-post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
+    <h2 class="blog-post-title" dir="auto"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
-    <p class="blog-post-meta"><time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format $dateFormat }}</time> by {{ .Params.author | default .Site.Params.author }}{{ if or (.Params.categories) (.Params.tags) }} in {{ partial "meta-terms.html" . }}{{ end }}</p>
+    <p class="blog-post-meta"><time {{ .Date.Format "2006-01-02T15:04:05Z07:00" | printf "datetime=%q" | safeHTMLAttr }}>{{ .Date.Format $dateFormat }}</time> {{ i18n "authoredBy" }} {{ .Params.author | default .Site.Params.author }}{{ if or (.Params.categories) (.Params.tags) }} {{ i18n "postedIn" }} {{ partial "meta-terms.html" . }}{{ end }}</p>
   </header>
   {{ .Summary }}
   <a href='{{ .Permalink }}'>{{ i18n "readMore" }}</a>

layouts/partials/cookie-consent.html

@@ -1,26 +1,40 @@
-<link href="{{ .Site.BaseURL }}css/cookieconsent.min.css" rel="stylesheet" type="text/css"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentcss }}" crossorigin="anonymous"{{ end }}>
+{{ $cookieConsentScript := resources.Get "js/haven.umd.min.js" | resources.Fingerprint }}
-<script src="{{ .Site.BaseURL }}js/cookieconsent.min.js"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentjs }}" crossorigin="anonymous"{{ end }} async></script>
+<script src="{{ $cookieConsentScript.Permalink }}"{{ if not .Site.Params.disable_sri }} integrity="{{ $cookieConsentScript.Data.Integrity }}" crossorigin="anonymous"{{ end }}></script>
 
 <script>
-window.addEventListener("load", function(){
+Haven.create({
-  window.cookieconsent.initialise({
+    notification: {
-    "palette": {
+        {{ with .Site.Params.cookie_consent_info_url -}}
-      "popup": {
+        policyUrl: {{ . | absURL }},
-        "background": "#428bca",
+        {{- end }}
-        "text": "#ffffff"
+        styles: {
-      },
+            background: '#428bca',
-      "button": {
+            textColor: '#ffffff',
-        "background": "#f71559"
+            buttonBackgroundColor: '#f71559',
-      }
+            buttonTextColor: '#ffffff',
+        },
     },
-    "content": {
+    translations: {
-      "message": '{{ i18n "cookieMessage" }}',
+      {{ .Lang }}: {
-      "dismiss": '{{ i18n "cookieDismiss" }}',
+            notification: {
-      "link": '{{ i18n "cookieLink" }}',
+                policy: '{{ i18n "cookieLink" }}',
-      "href": "{{ .Site.Params.cookie_consent_info_url | absURL}}"
+                message: '{{ i18n "cookieMessage" }}',
+                accept: '{{ i18n "cookieAccept" }}',
+                decline: '{{ i18n "cookieDecline" }}',
+            }
+        },
     },
-    "position": "bottom-right"
+    services: [
-  })});
+        {
+            name: 'google-analytics',
+            options: {
+                    id: {{ .Site.GoogleAnalytics }},
+            },
+            purposes: ['analytics'],
+            inject: true,
+        }
+    ]
+});
 </script>
 
 {{- /* vim: set ts=2 sw=2 et: */}}

layouts/partials/head-meta.html

@@ -1,8 +1,8 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-{{ template "_internal/opengraph.html" . }}
+{{ partial "opengraph.html" . }}
-{{ template "_internal/twitter_cards.html" . }}
+{{ partial "twitter_cards.html" . }}
 
 {{- with .Site.Params.google_verify_meta -}}
 <meta name="google-site-verification" content="{{ . }}" />
@@ -16,6 +16,6 @@
 <meta name="yandex-verification" content="{{ . }}" />
 {{ end }}
 
-{{- .Hugo.Generator -}}
+{{- .Site.Hugo.Generator -}}
 
 {{- /* vim: set ts=2 sw=2 et: */}}

layouts/partials/meta-terms.html

@@ -1,8 +1,8 @@
 {{ if .Params.categories }}
-<i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}, {{ end }}<a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}" rel="category tag">{{ . }}</a>{{ end }}
+<span class="fas fa-folder" aria-hidden="true"></span>&nbsp;{{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}<a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}/" rel="category tag">{{ . }}</a>{{ end }}
 {{ end }}
 {{ if .Params.tags }}
-<i class="fa fa-tag" aria-hidden="true"></i>&nbsp;{{ range $index, $tag := .Params.tags }}{{ if gt $index 0 }}, {{ end }}<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" rel="tag">{{ . }}</a>{{ end }}
+<span class="fas fa-tag" aria-hidden="true"></span>&nbsp;{{ range $index, $tag := .Params.tags }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}/" rel="tag">{{ . }}</a>{{ end }}
 {{ end }}
 
 {{- /* vim: set ts=2 sw=2 et: */}}

layouts/partials/opengraph.html

@@ -0,0 +1,73 @@
+<!--
+Import Hugo's internal twitter_cards.html template to add support for resolving
+images in page bundles and with falling back to the default of looking in the
+static assets directory.
+
+See: tpl/tplimpl/embedded/templates/opengraph.html
+See: https://github.com/gohugoio/hugo/issues/5078
+-->
+<meta property="og:title" content="{{ .Title }}" />
+<meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}" />
+<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" />
+<meta property="og:url" content="{{ .Permalink }}" />
+{{ with $.Params.images }}{{ range first 6 . -}}
+{{/* try to get the image from the page bundle */}}
+{{- with $.Page.Resources.GetMatch (printf "*%s*" .) -}}
+<meta property="og:image" content="{{ .Permalink }}" />
+{{/* otherwise, get the image from /static */}}
+{{- else -}}
+<meta property="og:image" content="{{ . | absURL }}" />
+{{- end }}
+{{ end }}{{ else -}}
+{{- $images := $.Resources.ByType "image" -}}
+{{- $featured := $images.GetMatch "*feature*" -}}
+{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- with $featured -}}
+<meta property="og:image" content="{{ $featured.Permalink }}"/>
+{{ else -}}
+{{- with $.Site.Params.images -}}
+<meta property="og:image" content="{{ index . 0 | absURL }}"/>
+{{ end }}{{ end }}{{ end }}
+
+{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}}
+{{- if .IsPage }}
+{{- if not .PublishDate.IsZero }}<meta property="article:published_time" {{ .PublishDate.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />
+{{ else if not .Date.IsZero }}<meta property="article:published_time" {{ .Date.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />
+{{ end }}
+{{- if not .Lastmod.IsZero }}<meta property="article:modified_time" {{ .Lastmod.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end }}
+{{- else }}
+{{- if not .Date.IsZero }}<meta property="og:updated_time" {{ .Lastmod.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />
+{{- end }}
+{{- end }}{{/* .IsPage */}}
+
+{{- with .Params.audio }}<meta property="og:audio" content="{{ . }}" />{{ end }}
+{{- with .Params.locale }}<meta property="og:locale" content="{{ . }}" />{{ end }}
+{{- with .Site.Params.title }}<meta property="og:site_name" content="{{ . }}" />{{ end }}
+{{- with .Params.videos }}
+{{- range . }}
+<meta property="og:video" content="{{ . | absURL }}" />
+{{ end }}{{ end }}
+
+{{- /* If it is part of a series, link to related articles */}}
+{{- $permalink := .Permalink }}
+{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }}
+{{- range $name := . }}
+  {{- $series := index $siteSeries $name }}
+  {{- range $page := first 6 $series.Pages }}
+    {{- if ne $page.Permalink $permalink }}<meta property="og:see_also" content="{{ $page.Permalink }}" />{{ end }}
+  {{- end }}
+{{ end }}{{ end }}
+
+{{- if .IsPage }}
+{{- range .Site.Authors }}{{ with .Social.facebook }}
+<meta property="article:author" content="https://www.facebook.com/{{ . }}" />{{ end }}{{ with .Site.Social.facebook }}
+<meta property="article:publisher" content="https://www.facebook.com/{{ . }}" />{{ end }}
+<meta property="article:section" content="{{ .Section }}" />
+{{- with .Params.tags }}{{ range first 6 . }}
+<meta property="article:tag" content="{{ . }}" />{{ end }}{{ end }}
+{{- end }}{{ end }}
+
+{{- /* Facebook Page Admin ID for Domain Insights */}}
+{{- with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}
+
+

layouts/partials/recent.html

@@ -2,7 +2,7 @@
     <h4>{{ i18n "recentPosts" }}</h4>
     <ol class="list-unstyled">
 {{ $num_recent_posts := (index .Site.Params.sidebar "num_recent_posts" | default 5) }}
-{{ range first $num_recent_posts (where .Site.Pages "Section" "in" .Site.Params.mainSections) }}
+{{ range first $num_recent_posts (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
 <li><a href="{{.RelPermalink}}">{{.Title | markdownify }}</a></li>
 {{ end }}
     </ol>

layouts/partials/sharing-icons.html

@@ -1,10 +1,9 @@
   <section>
     <h4>{{ i18n "share" }}</h4>
     <nav class="nav sharing-icons">
-      <a class="nav-item" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" title="Share on Facebook"><span class="fa fa-facebook fa-2x" aria-hidden="true"></span></a>
+      <a class="nav-item" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" title="Share on Facebook"><span class="fab fa-facebook-f fa-2x" aria-hidden="true"></span></a>
-      <a class="nav-item" href="https://plus.google.com/share?url={{ .Permalink }}" title="Share on Google+"><span class="fa fa-google-plus fa-2x" aria-hidden="true"></span></a>
+      <a class="nav-item" href="https://www.linkedin.com/shareArticle?mini=true&amp;url={{ .Permalink }}" title="Share on LinkedIn"><span class="fab fa-linkedin-in fa-2x" aria-hidden="true"></span></a>
-      <a class="nav-item" href="https://www.linkedin.com/shareArticle?mini=true&amp;url={{ .Permalink }}" title="Share on LinkedIn"><span class="fa fa-linkedin fa-2x" aria-hidden="true"></span></a>
+      <a class="nav-item" href="https://twitter.com/intent/tweet?url={{ .Permalink }}&amp;text={{ .Title }}" title="Tweet this"><span class="fab fa-twitter fa-2x"></span></a>
-      <a class="nav-item" href="https://twitter.com/home?status={{ .Permalink }}" title="Tweet this"><span class="fa fa-twitter fa-2x"></span></a>
     </nav>
   </section>
 

layouts/partials/sidebar.html

@@ -2,7 +2,7 @@
   {{ if and (.Site.Params.sidebar) (isset .Site.Params.sidebar "about") }}
   <section class="sidebar-module sidebar-module-inset">
     <h4>{{ i18n "about" }}</h4>
-    <p>{{ .Site.Params.sidebar.about | markdownify }}</p>
+    <p dir="auto">{{ .Site.Params.sidebar.about | markdownify }}</p>
   </section>
   {{ end }}
 

layouts/partials/twitter_cards.html

@@ -0,0 +1,42 @@
+<!--
+Import Hugo's internal twitter_cards.html template to add support for resolving
+images in page bundles and with falling back to the default of looking in the
+static assets directory.
+
+See: tpl/tplimpl/embedded/templates/twitter_cards.html
+See: https://github.com/gohugoio/hugo/issues/5078
+-->
+{{- with $.Params.images -}}
+<meta name="twitter:card" content="summary_large_image"/>
+{{/* try to get the image from the page bundle */}}
+{{- with $.Page.Resources.GetMatch (printf "*%s*" .) -}}
+<meta name="twitter:image" content="{{ .Permalink }}"/>
+{{- else -}}
+<meta name="twitter:image" content="{{ index . 0 | absURL }}"/>
+{{- end -}}
+{{ else -}}
+{{- $images := $.Resources.ByType "image" -}}
+{{- $featured := $images.GetMatch "*feature*" -}}
+{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- with $featured -}}
+<meta name="twitter:card" content="summary_large_image"/>
+<meta name="twitter:image" content="{{ $featured.Permalink }}"/>
+{{- else -}}
+{{- with $.Site.Params.images -}}
+<meta name="twitter:card" content="summary_large_image"/>
+<meta name="twitter:image" content="{{ index . 0 | absURL }}"/>
+{{ else -}}
+<meta name="twitter:card" content="summary"/>
+{{- end -}}
+{{- end -}}
+{{- end }}
+<meta name="twitter:title" content="{{ .Title }}"/>
+<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"/>
+{{ with .Site.Social.twitter -}}
+<meta name="twitter:site" content="@{{ . }}"/>
+{{ end -}}
+{{ range .Site.Authors }}
+{{ with .twitter -}}
+<meta name="twitter:creator" content="@{{ . }}"/>
+{{ end -}}
+{{ end -}}

layouts/robots.txt

@@ -1,3 +1,3 @@
-Sitemap: {{ .Site.BaseURL }}sitemap.xml
+Sitemap: {{ "sitemap.xml" | absURL }}
 
 User-agent: *

layouts/shortcodes/figure.html

@@ -0,0 +1,92 @@
+{{/*
+
+figure with auto-resizing and srcset v2020-11-30
+
+Drop-in replacement for Hugo's figure shortcode as of 2020-05-02 that uses img srcset
+to enable browsers to download only the resolution that they need.
+
+The resizing and srcset magic only works for images that are part of the page
+bundle. It will fall back to stock Hugo figure behaviour otherwise.
+
+Improvements that were initially out of reach of my Hugo template programming "skills"
+but have now been taken care of:
+- [x] gracefully handle images that are not in page bundle, i.e. no image processing available
+- [x] use a single configurable sizes array, and derive everything from there
+
+See https://cpbotha.net/2020/05/02/drop-in-replacement-for-hugo-figure-shortcode-with-img-srcset-support/
+
+- original srcset img shortcode from: https://laurakalbag.com/processing-responsive-images-with-hugo/
+- original hugo figure shortcode from: https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/shortcodes/figure.html
+- no unnecessary resizes and more nudges by Stéfan van der Walt https://mentat.za.net/
+- mashing together and srcset logic fixes by Charl P. Botha https://cpbotha.net/
+
+Changes:
+- 2020-11-30 handle images that are rotated 90 degrees (should handle more eventually)
+- 2020-05-10 fall back to stock Hugo behaviour when no page bundle found
+- 2020-05-04 no unnecessary resizes, sizes in array
+- 2020-05-02 initial release
+
+*/}}
+
+{{/* hugo will resize to all of these sizes that are smaller than your original. configure if you like! */}}
+{{ $sizes := (slice "480" "800" "1200" "1500") }}
+
+{{/* get file that matches the filename as specified as src="" in shortcode */}}
+{{ $src := .Page.Resources.GetMatch (printf "*%s*" (.Get "src")) }}
+
+<figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
+    {{- if .Get "link" -}}
+        <a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
+    {{- end }}
+    <img
+        {{ if $src }}
+            sizes="(min-width: 35em) 1200px, 100vw"
+            {{/* only srcset images smaller than or equal to the src (original) image size, as Hugo will upscale small images */}}  
+            srcset='
+            {{ range $sizes }}
+                   {{ $size := . }}
+                   {{/* https://discourse.gohugo.io/t/image-exif-orientation/22902/7 */}}
+                   {{/* set orientation to 1 just in case it doesnt exist in Exif */}}
+                   {{ $orientation := 1 }}
+                   {{ with $src.Exif }}
+                   {{ $orientation := .Tags.Orientation }}
+                   {{ if and (ge $src.Width $size) (eq $orientation 8) }}
+                       {{ ($src.Resize (printf "%sx r90" $size)).Permalink }} {{ (printf "%sw" $size) }},
+                   {{ else if ge $src.Width $size }}{{ ($src.Resize (printf "%sx" $size)).Permalink }} {{ (printf "%sw" $size) }},{{ end }}
+                   {{ end }}
+            {{ end }}'
+
+            {{/* when no support for srcset (old browsers, RSS), we load small (800px) */}}
+            {{/* if image smaller than 800, then load the image itself */}}
+            {{ if ge $src.Width "800" }}src="{{ ($src.Resize "800x").Permalink }}"
+            {{ else }}src="{{ $src.Permalink }}"
+            {{ end }}
+
+        {{ else }}
+            {{/* fall back to stock hugo behaviour when image is not available in bundle */}}
+            src="{{ .Get "src" }}"
+        {{ end }}
+
+        {{- if or (.Get "alt") (.Get "caption") }}
+            alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
+        {{- end -}}
+        {{- with .Get "width" }} width="{{ . }}"{{ end -}}
+        {{- with .Get "height" }} height="{{ . }}"{{ end -}}
+    /> <!-- Closing img tag -->
+    {{- if .Get "link" }}</a>{{ end -}}
+    {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
+        <figcaption>
+            {{ with (.Get "title") -}}
+                <h4>{{ . }}</h4>
+            {{- end -}}
+            {{- if or (.Get "caption") (.Get "attr") -}}<p>
+                {{- .Get "caption" | markdownify -}}
+                {{- with .Get "attrlink" }}
+                    <a href="{{ . }}">
+                {{- end -}}
+                {{- .Get "attr" | markdownify -}}
+                {{- if .Get "attrlink" }}</a>{{ end }}</p>
+            {{- end }}
+        </figcaption>
+    {{- end }}
+</figure>

package.json

@@ -1,27 +1,31 @@
 {
   "name": "hugo-theme-bootstrap4-blog",
-  "version": "1.1.4",
+  "version": "1.6.0",
   "description": "A Bootstrap v4 theme for the Hugo static site generator.",
   "repository": {
     "type": "git",
     "url": "https://github.com/alanorth/hugo-theme-bootstrap4-blog.git"
   },
   "scripts": {
-    "build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss static/css/style.css.tmp && cleancss --level 1 static/css/style.css.tmp -o static/css/style.css",
+    "build:css": "sass --style expanded source/scss/style.scss assets/css/style.css.tmp && cleancss --level 1 assets/css/style.css.tmp -o assets/css/style.css",
-    "build:fonts": "cp node_modules/font-awesome/fonts/* static/fonts",
+    "build:rtlcss": "rtlcss -s assets/css/style.css.tmp assets/css/style.rtl.css.tmp && cleancss --level 1 assets/css/style.rtl.css.tmp -o assets/css/style.rtl.css",
-    "build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css static/css && cp node_modules/cookieconsent/build/cookieconsent.min.js static/js",
+    "build:cookieconsent": "cp node_modules/@chiiya/haven/dist/haven.umd.min.js assets/js",
-    "build:generatesri": "node build/sri.js > data/sri.toml",
+    "build:js": "webpack",
-    "build": "npm run build:css && npm run build:fonts && npm run build:cookieconsent && npm run build:generatesri && npm run clean",
+    "build": "npm run build:css && npm run build:rtlcss && npm run build:js && npm run build:cookieconsent && npm run clean",
-    "clean": "rm static/css/style.css.tmp"
+    "clean": "rm assets/css/style.css.tmp assets/css/style.css.tmp.map assets/css/style.rtl.css.tmp"
   },
   "keywords": "hugo",
   "author": "Alan Orth",
-  "license": "GPL-3.0",
+  "license": "CC-BY-3.0",
   "devDependencies": {
-    "bootstrap": "4.1.3",
+    "@chiiya/haven": "^0.6.2",
-    "clean-css-cli": "^4.1.11",
+    "@fortawesome/fontawesome-svg-core": "^1.2.34",
-    "cookieconsent": "^3.0.4",
+    "@fortawesome/free-brands-svg-icons": "^5.15.2",
-    "font-awesome": "^4.7.0",
+    "@fortawesome/free-solid-svg-icons": "^5.15.2",
-    "node-sass": "^4.9.1"
+    "bootstrap": "^4.6.0",
+    "clean-css-cli": "^4.3.0",
+    "rtlcss": "^2.6.2",
+    "sass": "^1.32.4",
+    "webpack-cli": "^4.5.0"
   }
 }

source/js/fontawesome.js

@@ -0,0 +1,13 @@
+import { library, dom } from '@fortawesome/fontawesome-svg-core'
+import { faFolder, faTag } from '@fortawesome/free-solid-svg-icons'
+import { faFacebookF, faTwitter, faLinkedinIn } from '@fortawesome/free-brands-svg-icons'
+
+// Add solid icons to our library
+library.add(faFolder, faTag)
+
+// Add brand icons to our library
+library.add(faFacebookF, faTwitter, faLinkedinIn)
+
+// Replace any existing <i> tags with <svg> and set up a MutationObserver to
+// continue doing this as the DOM changes.
+dom.watch()

source/scss/bootstrap.scss

@@ -1,42 +1,44 @@
 /*!
- * Bootstrap v4.1.3 (https://getbootstrap.com/)
+ * Bootstrap v4.6.0 (https://getbootstrap.com/)
- * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2018 Twitter, Inc.
+ * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 
-@import "node_modules/bootstrap/scss/functions";
+@import "../../node_modules/bootstrap/scss/functions";
-@import "node_modules/bootstrap/scss/variables";
+@import "../../node_modules/bootstrap/scss/variables";
-@import "node_modules/bootstrap/scss/mixins";
+@import "../../node_modules/bootstrap/scss/mixins";
-//@import "node_modules/bootstrap/scss/root";
+@import "../../node_modules/bootstrap/scss/root";
-@import "node_modules/bootstrap/scss/reboot";
+@import "../../node_modules/bootstrap/scss/reboot";
-@import "node_modules/bootstrap/scss/type";
+@import "../../node_modules/bootstrap/scss/type";
-@import "node_modules/bootstrap/scss/images";
+@import "../../node_modules/bootstrap/scss/images";
-@import "node_modules/bootstrap/scss/code";
+@import "../../node_modules/bootstrap/scss/code";
-@import "node_modules/bootstrap/scss/grid";
+@import "../../node_modules/bootstrap/scss/grid";
-//@import "node_modules/bootstrap/scss/tables";
+//@import "../../node_modules/bootstrap/scss/tables";
-@import "node_modules/bootstrap/scss/forms";
+@import "../../node_modules/bootstrap/scss/forms";
-@import "node_modules/bootstrap/scss/buttons";
+@import "../../node_modules/bootstrap/scss/buttons";
-//@import "node_modules/bootstrap/scss/transitions";
+//@import "../../node_modules/bootstrap/scss/transitions";
-//@import "node_modules/bootstrap/scss/dropdown";
+//@import "../../node_modules/bootstrap/scss/dropdown";
-//@import "node_modules/bootstrap/scss/button-group";
+//@import "../../node_modules/bootstrap/scss/button-group";
-//@import "node_modules/bootstrap/scss/input-group";
+//@import "../../node_modules/bootstrap/scss/input-group";
-//@import "node_modules/bootstrap/scss/custom-forms";
+//@import "../../node_modules/bootstrap/scss/custom-forms";
-@import "node_modules/bootstrap/scss/nav";
+@import "../../node_modules/bootstrap/scss/nav";
-@import "node_modules/bootstrap/scss/navbar";
+@import "../../node_modules/bootstrap/scss/navbar";
-//@import "node_modules/bootstrap/scss/card";
+//@import "../../node_modules/bootstrap/scss/card";
-//@import "node_modules/bootstrap/scss/breadcrumb";
+//@import "../../node_modules/bootstrap/scss/breadcrumb";
-@import "node_modules/bootstrap/scss/pagination";
+@import "../../node_modules/bootstrap/scss/pagination";
-//@import "node_modules/bootstrap/scss/badge";
+//@import "../../node_modules/bootstrap/scss/badge";
-//@import "node_modules/bootstrap/scss/jumbotron";
+//@import "../../node_modules/bootstrap/scss/jumbotron";
-//@import "node_modules/bootstrap/scss/alert";
+//@import "../../node_modules/bootstrap/scss/alert";
-//@import "node_modules/bootstrap/scss/progress";
+//@import "../../node_modules/bootstrap/scss/progress";
-//@import "node_modules/bootstrap/scss/media";
+//@import "../../node_modules/bootstrap/scss/media";
-//@import "node_modules/bootstrap/scss/list-group";
+//@import "../../node_modules/bootstrap/scss/list-group";
-//@import "node_modules/bootstrap/scss/close";
+//@import "../../node_modules/bootstrap/scss/close";
-//@import "node_modules/bootstrap/scss/modal";
+//@import "../../node_modules/bootstrap/scss/toasts";
-//@import "node_modules/bootstrap/scss/tooltip";
+//@import "../../node_modules/bootstrap/scss/modal";
-//@import "node_modules/bootstrap/scss/popover";
+//@import "../../node_modules/bootstrap/scss/tooltip";
-//@import "node_modules/bootstrap/scss/carousel";
+//@import "../../node_modules/bootstrap/scss/popover";
-@import "node_modules/bootstrap/scss/utilities";
+//@import "../../node_modules/bootstrap/scss/carousel";
-@import "node_modules/bootstrap/scss/print";
+//@import "../../node_modules/bootstrap/scss/spinners";
+@import "../../node_modules/bootstrap/scss/utilities";
+@import "../../node_modules/bootstrap/scss/print";

source/scss/font-awesome.scss

@@ -1,35 +0,0 @@
-/*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@import "node_modules/font-awesome/scss/variables";
-@import "node_modules/font-awesome/scss/mixins";
-@import "node_modules/font-awesome/scss/path";
-@import "node_modules/font-awesome/scss/core";
-@import "node_modules/font-awesome/scss/larger";
-@import "node_modules/font-awesome/scss/fixed-width";
-//@import "list";
-//@import "bordered-pulled";
-//@import "animated";
-//@import "rotated-flipped";
-//@import "stacked";
-//@import "icons";
-// selectively import icons we need from font-awesome
-// see: node_modules/font-awesome/scss/_icons.scss
-.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; }
-.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; }
-.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; }
-.#{$fa-css-prefix}-google-plus:before { content: $fa-var-google-plus; }
-.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; }
-.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; }
-.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; }
-.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; }
-.#{$fa-css-prefix}-y-combinator-square:before,
-.#{$fa-css-prefix}-yc-square:before,
-.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; }
-.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; }
-.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; }
-.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; }
-.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; }
-@import "node_modules/font-awesome/scss/screen-reader";

source/scss/style.scss

@@ -1,10 +1,6 @@
-// selectively import components we need from font-awesome
-// see: node_modules/font-awesome/scss/font-awesome.scss
-@import 'source/scss/font-awesome';
-
 // selectively import components we need from bootstrap
 // see: node_modules/bootstrap/scss/bootstrap.scss
-@import 'source/scss/bootstrap';
+@import 'bootstrap';
 
 // local style overrides
-@import 'source/scss/main';
+@import 'main';

static/css/cookieconsent.min.css

@@ -1,6 +0,0 @@
-.cc-window{opacity:1;transition:opacity 1s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}.cc-grower{max-height:0;overflow:hidden;transition:max-height 1s}
-.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-static{position:static}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-banner .cc-btn:last-child{min-width:140px}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:focus,.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:focus,.cc-close:hover{opacity:1}
-.cc-revoke.cc-top{top:0;left:3em;border-bottom-left-radius:.5em;border-bottom-right-radius:.5em}.cc-revoke.cc-bottom{bottom:0;left:3em;border-top-left-radius:.5em;border-top-right-radius:.5em}.cc-revoke.cc-left{left:3em;right:unset}.cc-revoke.cc-right{right:3em;left:unset}.cc-top{top:1em}.cc-left{left:1em}.cc-right{right:1em}.cc-bottom{bottom:1em}.cc-floating>.cc-link{margin-bottom:1em}.cc-floating .cc-message{display:block;margin-bottom:1em}.cc-window.cc-floating .cc-compliance{-ms-flex:1 0 auto;flex:1 0 auto}.cc-window.cc-banner{-ms-flex-align:center;align-items:center}.cc-banner.cc-top{left:0;right:0;top:0}.cc-banner.cc-bottom{left:0;right:0;bottom:0}.cc-banner .cc-message{-ms-flex:1;flex:1}.cc-compliance{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:justify;align-content:space-between}.cc-compliance>.cc-btn{-ms-flex:1;flex:1}.cc-btn+.cc-btn{margin-left:.5em}
-@media print{.cc-revoke,.cc-window{display:none}}@media screen and (max-width:900px){.cc-btn{white-space:normal}}@media screen and (max-width:414px) and (orientation:portrait),screen and (max-width:736px) and (orientation:landscape){.cc-window.cc-top{top:0}.cc-window.cc-bottom{bottom:0}.cc-window.cc-banner,.cc-window.cc-left,.cc-window.cc-right{left:0;right:0}.cc-window.cc-banner{-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-floating{max-width:none}.cc-window .cc-message{margin-bottom:1em}.cc-window.cc-banner{-ms-flex-align:unset;align-items:unset}}
-.cc-floating.cc-theme-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-theme-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-theme-classic .cc-btn{border-radius:5px}.cc-theme-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-theme-classic .cc-btn{display:inline-block}
-.cc-theme-edgeless.cc-window{padding:0}.cc-floating.cc-theme-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-theme-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-theme-edgeless .cc-message{margin-left:1em}.cc-floating.cc-theme-edgeless .cc-btn+.cc-btn{margin-left:0}

theme.toml

@@ -1,15 +1,16 @@
 name = "Hugo Bootstrap v4 Blog"
-license = "GPL-3.0"
+license = "CC-BY-3.0"
-licenselink = "https://github.com/alanorth/hugo-theme-bootstrap4/blob/master/LICENSE.txt"
+licenselink = "https://github.com/alanorth/hugo-theme-bootstrap4-blog/blob/master/LICENSE.txt"
 description = "A simple Hugo theme based on the Bootstrap v4 blog example."
-homepage = "https://github.com/alanorth/hugo-theme-bootstrap4"
+homepage = "https://github.com/alanorth/hugo-theme-bootstrap4-blog"
+demosite = "https://picturingjordan.com"
 tags = ["bootstrap", "blog", "font awesome"]
 features = ["responsive", "blog"]
-min_version = 0.25
+min_version = 0.55
 
 [author]
   name = "Alan Orth"
-  homepage = "https://englishbulgaria.net"
+  homepage = "https://picturingjordan.com"
 
 [original]
   author = "mdo"

webpack.config.js

@@ -0,0 +1,10 @@
+const path = require('path');
+
+module.exports = {
+    entry: './source/js/fontawesome.js',
+    output: {
+            path: path.resolve(__dirname, 'assets/js'),
+            filename: 'fontawesome.min.js'
+          },
+    mode: 'production'
+};