diff --git a/scripts/copy-npm-contrib.sh b/scripts/copy-npm-contrib.sh index 392fe5e..794c058 100755 --- a/scripts/copy-npm-contrib.sh +++ b/scripts/copy-npm-contrib.sh @@ -20,8 +20,6 @@ mkcontrib elevator-js node_modules/elevator.js/demo/music/* mkcontrib shareon node_modules/shareon/dist/{shareon.iife.*,shareon.min.css*} mkcontrib fira-code node_modules/@fontsource/fira-code/latin.css mkcontrib fira-code/files node_modules/@fontsource/fira-code/files/fira-code-latin-* -mkcontrib htmx node_modules/htmx.org/dist/{htmx.min.js,ext} -mkcontrib glightbox node_modules/glightbox/dist/css/glightbox.min.css curl -sf -L https://raw.githubusercontent.com/genmon/aboutfeeds/main/tools/pretty-feed-v3.xsl -o $CONTRIB_DIR/pretty-feed-v3.xsl diff --git a/static/src/js/base.js b/static/src/js/base.js index 1e34e0a..ddc82ff 100644 --- a/static/src/js/base.js +++ b/static/src/js/base.js @@ -2,6 +2,8 @@ const Elevator = require("elevator.js"); const debounce = require("lodash.debounce"); const throttle = require("lodash.throttle"); +require("htmx.org"); + const HERO = document.querySelector("section.hero"); const ROOT = document.querySelector(":root"); diff --git a/static/src/js/lightbox.js b/static/src/js/content.js similarity index 76% rename from static/src/js/lightbox.js rename to static/src/js/content.js index 9379522..d039c92 100644 --- a/static/src/js/lightbox.js +++ b/static/src/js/content.js @@ -1,3 +1,4 @@ +require("lite-youtube-embed"); const GLightbox = require("glightbox"); window.addEventListener("load", () => { diff --git a/static/src/js/lite-youtube-embed.js b/static/src/js/lite-youtube-embed.js deleted file mode 100644 index 685f5c0..0000000 --- a/static/src/js/lite-youtube-embed.js +++ /dev/null @@ -1 +0,0 @@ -require("lite-youtube-embed"); diff --git a/static/src/scss/content-contrib.scss b/static/src/scss/content-contrib.scss new file mode 100644 index 0000000..88b26e3 --- /dev/null +++ b/static/src/scss/content-contrib.scss @@ -0,0 +1,3 @@ +@import "lite-youtube-embed/src/lite-yt-embed"; +@import "shareon/dist/shareon.min"; +@import "glightbox/dist/css/glightbox"; diff --git a/static/src/scss/lite-youtube-embed.scss b/static/src/scss/lite-youtube-embed.scss deleted file mode 100644 index 62c1ebc..0000000 --- a/static/src/scss/lite-youtube-embed.scss +++ /dev/null @@ -1 +0,0 @@ -@import "lite-youtube-embed/src/lite-yt-embed"; diff --git a/website/common/templates/base.html b/website/common/templates/base.html index 4626efe..3adf201 100644 --- a/website/common/templates/base.html +++ b/website/common/templates/base.html @@ -44,12 +44,11 @@ {% footer %} {% endcache %} - - - {# Not async to avoid bright flashes #} {% sri_static "js/dark-mode.js" %} + + {% block extra_js %}{% endblock %} {% block plausible %} diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html index ca8edb5..aa3ec1b 100644 --- a/website/common/templates/common/content_page.html +++ b/website/common/templates/common/content_page.html @@ -23,15 +23,13 @@ {% endblock %} {% block extra_css %} - {% sri_static "css/lite-youtube-embed.css" %} + {% sri_static "css/content-contrib.css" %} {% sri_static "contrib/shareon/shareon.min.css" %} - {% sri_static "contrib/glightbox/glightbox.min.css" %} {% endblock %} {% block extra_js %} - + - {% endblock %}