From b6c87d9583a8024039e0ce10691d69ac75014a3b Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 28 Jun 2022 22:19:28 +0100
Subject: [PATCH] Only load content styles on content pages

---
 templates/base.html                               |  3 ---
 website/blog/templates/blog/blog_post_page.html   | 14 +-------------
 website/common/templates/common/content_page.html | 13 +++++++++++--
 website/common/templates/common/listing_page.html |  2 --
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index a8c96bd..e19a83d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,8 +16,6 @@
 
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}">
     <link rel="stylesheet" type="text/css" href="{% static 'contrib/fontawesome/css/all.min.css' %}">
-    <link rel="stylesheet" type="text/css" href="{% static 'css/lite-youtube-embed.css' %}">
-    <link rel="stylesheet" type="text/css" href="{% url 'static-pygments:styles' 'default' %}">
 
     {% block extra_css %}{% endblock %}
   </head>
@@ -41,7 +39,6 @@
 
 
     <script async defer type="text/javascript" src="{% static 'js/base.js' %}"></script>
-    <script async defer type="text/javascript" src="{% static 'js/lite-youtube-embed.js' %}"></script>
 
     {% block darkmode %}
       <script type="text/javascript" src="{% static 'js/darkreader.js' %}"></script>
diff --git a/website/blog/templates/blog/blog_post_page.html b/website/blog/templates/blog/blog_post_page.html
index 31c57dd..1d82e45 100644
--- a/website/blog/templates/blog/blog_post_page.html
+++ b/website/blog/templates/blog/blog_post_page.html
@@ -1,13 +1 @@
-{% extends "wagtail_base.html" %}
-
-{% load wagtailcore_tags %}
-
-{% block content %}
-
-{% include "common/hero.html" %}
-
-<section class="container content">
-  {% include_block page.body %}
-</section>
-
-{% endblock content %}
+{% extends "common/content_page.html" %}
diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html
index 31c57dd..e580c42 100644
--- a/website/common/templates/common/content_page.html
+++ b/website/common/templates/common/content_page.html
@@ -1,6 +1,6 @@
 {% extends "wagtail_base.html" %}
 
-{% load wagtailcore_tags %}
+{% load wagtailcore_tags static %}
 
 {% block content %}
 
@@ -10,4 +10,13 @@
   {% include_block page.body %}
 </section>
 
-{% endblock content %}
+{% endblock %}
+
+{% block extra_css %}
+  <link rel="stylesheet" type="text/css" href="{% static 'css/lite-youtube-embed.css' %}">
+  <link rel="stylesheet" type="text/css" href="{% url 'static-pygments:styles' 'default' %}">
+{% endblock %}
+
+{% block extra_js %}
+  <script async defer type="text/javascript" src="{% static 'js/lite-youtube-embed.js' %}"></script>
+{% endblock %}
diff --git a/website/common/templates/common/listing_page.html b/website/common/templates/common/listing_page.html
index 8a009f3..7cac715 100644
--- a/website/common/templates/common/listing_page.html
+++ b/website/common/templates/common/listing_page.html
@@ -1,7 +1,5 @@
 {% extends "wagtail_base.html" %}
 
-{% load util_tags %}
-
 {% block content %}
 
 {% include "common/hero.html" %}