diff --git a/_data/blogroll.js b/_data/blogroll.js index 616e38b..cb71f2d 100644 --- a/_data/blogroll.js +++ b/_data/blogroll.js @@ -311,10 +311,17 @@ export default { }, { title: "Reveal from the Center for Investigative Reporting", - feedUrl: "https://revealnews.org/feed", - url: "https://revealnews.org/", + feedUrl: "https://contrarian.substack.com/feed", + url: "https://contrarian.substack.com/", description: - 'Reveal is an investigative radio show and podcast that holds the powerful accountable by reporting about everything from racial and social injustices to threats to public safety and democracy. (Thanks to werd.io for the recommendation.)', + "Democracy faces an unprecedented threat from an authoritarian movement built on lies and contempt for the rule of law. The first and most critical defense of democracy—a robust, independent free press—has been missing in action. Corporate and billionaire media owners have shied away from confrontation, engaged in false equivalence, and sought to curry favor with Donald Trump. It is hardly surprising that readers and viewers are fleeing from these outlets. Americans need an alternative. The Contrarian is that alternative: unflinching, unapologetic, and unwavering in its commitment to truth-telling.", + }, + { + title: "The Contrarian", + feedUrl: "https://themarkup.org/feeds/rss.xml", + url: "https://contrarian.substack.com/", + description: + 'The Markup investigates how powerful institutions are using technology to change our society. (Thanks to werd.io for the recommendation.)', }, { title: "The Markup", diff --git a/_data/metadata.js b/_data/metadata.js index c302077..c0f4ff9 100644 --- a/_data/metadata.js +++ b/_data/metadata.js @@ -14,7 +14,7 @@ export default { profilePic: "/img/CN20191025_301_Srt_SQUARE_crop.jpg", }, blogrollUrl: "/blogroll/nathanUpchurchBlogroll.opml", - copyrightNotice: "© Nathan Upchurch 2022 - 2024", + copyrightNotice: "© Nathan Upchurch 2022 - 2025", defaultPostImageURL: "/img/logo_post.svg", defaultPostImageAlt: "The logo for this blog: a capital letter N.", mastodonHost: "lounge.town", diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk index 7f6bb44..8cea4cc 100644 --- a/_includes/layouts/base.njk +++ b/_includes/layouts/base.njk @@ -2,10 +2,9 @@ {% include "metadata.njk" %} - {#- Bundle CSS #} - {%- css %}{% include "public/css/index.css" %}{% endcss %} - {%- css %}{% include "public/css/webfonts/webfonts.css" %}{% endcss %} - + + + {% include "structuredData.njk" %} {% include "umami.html" %} diff --git a/_includes/layouts/base_full_width_text.njk b/_includes/layouts/base_full_width_text.njk deleted file mode 100644 index 4121ba7..0000000 --- a/_includes/layouts/base_full_width_text.njk +++ /dev/null @@ -1,21 +0,0 @@ - - - - {% include "metadata.njk" %} - {#- Bundle CSS #} - {%- css %}{% include "public/css/index.css" %}{% endcss %} - {%- css %}{% include "public/css/webfonts/webfonts.css" %}{% endcss %} - - {% include "structuredData.njk" %} - {% include "umami.html" %} - - - {% include "header.njk" %} -
-
- {{ content | safe }} -
-
- {% include "footer.njk" %} - - diff --git a/_includes/layouts/links.njk b/_includes/layouts/links.njk index d020901..26f2312 100644 --- a/_includes/layouts/links.njk +++ b/_includes/layouts/links.njk @@ -1,7 +1,6 @@ --- -layout: layouts/baseBareBones.njk +layout: layouts/linksPage.njk --- -{%- css %}{% include "public/css/me.css" %}{% endcss %}