4 files changed, 31 insertions, 71 deletions
diff --git a/pydis_site/templates/base/base-hero.html b/pydis_site/templates/base/base-hero.html
deleted file mode 100644
index 652662e0..00000000
--- a/pydis_site/templates/base/base-hero.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% load django_simple_bulma %}
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-  <meta name="description"
-        content="{% block meta-description %}We're a large, friendly community focused around the Python programming language. Our community is open to those who wish to learn the language, as well as those looking to help others.{% endblock %}">
-
-  <title>Python Discord | {% block title %}Website{% endblock %}</title>
-
-  {% bulma %}
-
-  {# Font-awesome here is defined explicitly so that we can have Pro #}
-  <link rel="stylesheet"
-        href="https://pro.fontawesome.com/releases/v5.7.2/css/all.css"
-        integrity="sha384-6jHF7Z3XI3fF4XZixAuSu0gGKrXwoX/w3uFPxC56OtjChio7wtTGJWRW53Nhx6Ev"
-        crossorigin="anonymous"
-  >
-
-  {% block head %}{% endblock %}
-</head>
-<body>
-
-<section class="hero is-primary">
-  <div class="hero-head">
-    {% block hero-head %}{% endblock %}
-  </div>
-  <div class="hero-body">
-    {% block hero-body %}{% endblock %}
-  </div>
-  <div class="hero-foot">
-    {% block hero-foot %}{% endblock %}
-    {% include "base/navbar.html" with active_item=False dropdowns=True icon_weight="fas" use_logo=False %}
-  </div>
-</section>
-
-{% block content %}{% endblock %}
-
-<footer class="footer has-background-dark has-text-light">
-  <div class="content has-text-centered">
-    <p>
-      &copy; 2019 Python Discord | Built with Django and Bulma
-    </p>
-  </div>
-</footer>
-</body>
-</html>
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 46a273ec..e1cd0be2 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -24,16 +24,10 @@
   {% block head %}{% endblock %}
 </head>
 <body>
-{% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="fal" use_logo=True %}
-{% block content %}{% endblock %}
-
-<footer class="footer has-background-dark has-text-light">
-  <div class="content has-text-centered">
-    <p>
-      &copy; 2019 Python Discord | Built with Django and Bulma
-    </p>
-  </div>
-</footer>
+
+{% block content %}
+  {{ block.super }}
+{% endblock %}
 
 </body>
 </html>
diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html
new file mode 100644
index 00000000..b14bd82c
--- /dev/null
+++ b/pydis_site/templates/base/footer.html
@@ -0,0 +1,9 @@
+<footer class="footer has-background-dark has-text-light">
+  <div class="content has-text-centered">
+    <p>
+      &copy; 2019 Python Discord | Built with Django and Bulma
+    </p>
+  </div>
+</footer>
+
+<!-- vim: set ft=htmldjango: -->
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index c69f7bcd..61b4b03e 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -1,4 +1,4 @@
-{% extends 'base/base-hero.html' %}
+{% extends 'base/base.html' %}
 {% load static %}
 
 {% block title %}Home{% endblock %}
@@ -6,17 +6,22 @@
   <link rel="stylesheet" href="{% static "css/home/index.css" %}">
 {% endblock %}
 
-{% block hero-body %}
-  <div class="container is-flex">
-    <img class="hero-image is-centered" src="{% static "images/logo_site_banner.svg" %}" alt="Python Discord logo" />
-  </div>
-  <div class="container has-text-centered">
-    <h1 class="title is-4">
-      The hottest Python community on the web
-    </h1>
-  </div>
-{% endblock %}
 {% block content %}
+  <section class="hero is-primary">
+    <div class="hero-body">
+      <div class="container is-flex">
+        <img class="hero-image is-centered" src="{% static "images/logo_site_banner.svg" %}" alt="Python Discord logo" />
+      </div>
+      <div class="container has-text-centered">
+        <h1 class="title is-4">
+          The hottest Python community on the web
+        </h1>
+      </div>
+    </div>
+    <div class="hero-foot">
+      {% include "base/navbar.html" with active_item=False dropdowns=True icon_weight="fas" use_logo=False %}
+    </div>
+  </section>
   <section class="section">
     <div class="container is-spaced">
       <div class="columns">
@@ -61,6 +66,8 @@
       </div>
     </div>
   </section>
+
+  {% include "base/footer.html" %}
 {% endblock %}
 
 <!-- vim: set ft=htmldjango: -->