aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site/templates/base
diff options
context:
space:
mode:
authorGravatar kosayoda <[email protected]>2021-05-14 13:58:56 +0800
committerGravatar kosayoda <[email protected]>2021-05-14 14:23:29 +0800
commit274efc3ec73e2bcfee9cd93b26f737ee68fd4638 (patch)
treec74a0fb5cb80b605d21843b8bd424a192198dd8a /pydis_site/templates/base
parentMerge pull request #485 from python-discord/ks129/dewikification/redirection (diff)
Merge branch main into dewikification
Diffstat (limited to 'pydis_site/templates/base')
-rw-r--r--pydis_site/templates/base/base.html1
-rw-r--r--pydis_site/templates/base/footer.html2
-rw-r--r--pydis_site/templates/base/navbar.html17
3 files changed, 12 insertions, 8 deletions
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 6fc0c6bb..906fc577 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -27,7 +27,6 @@
{# Font-awesome here is defined explicitly so that we can have Pro #}
<script src="https://kit.fontawesome.com/ae6a3152d8.js"></script>
- <script src="{% static "js/base/modal.js" %}"></script>
<link rel="stylesheet" href="{% static "css/base/base.css" %}">
{% block head %}{% endblock %}
diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html
index 90f06f3c..bca43b5d 100644
--- a/pydis_site/templates/base/footer.html
+++ b/pydis_site/templates/base/footer.html
@@ -1,7 +1,7 @@
<footer class="footer has-background-dark has-text-light">
<div class="content has-text-centered">
<p>
- Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
+ Powered by <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085"><span id="linode-logo">Linode</span></a><br>Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
</p>
</div>
</footer>
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index ebafa269..f19706cd 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -19,7 +19,7 @@
<div class="navbar-menu is-paddingless" id="navbar_menu">
<div class="navbar-end">
- {# Discord invite - only visible in the hamburger on mobile sizes. #}
+ {# Burger-menu Discord #}
<a class="navbar-item is-hidden-desktop" href="https://discord.gg/python">
<span class="icon is-size-4 is-medium"><i class="fab fa-discord"></i></span>
<span>&nbsp;Discord</span>
@@ -56,7 +56,7 @@
</a>
{# More #}
- <div class="navbar-item has-dropdown is-hoverable has-left-margin-1">
+ <div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
More
</a>
@@ -73,6 +73,9 @@
<a class="navbar-item" href="{% url "content:page_category" location="frequently-asked-questions" %}">
FAQ
</a>
+ <a class="navbar-item" href="{% url 'timeline' %}">
+ Timeline
+ </a>
<a class="navbar-item" href="{% url "content:page_category" location="rules" %}">
Rules
</a>
@@ -94,11 +97,13 @@
</a>
</div>
</div>
+
+ {# Desktop Nav Discord #}
+ <div id="discord-btn" class="buttons is-hidden-touch">
+ <a href="https://discord.gg/python" class="button is-large is-primary">Discord</a>
+ </div>
+
</div>
- {# Join us on Discord! #}
- <a class="navbar-item is-fullsize has-no-highlight has-left-margin-1" href="https://discord.gg/python">
- <img class="is-hidden-touch" src="{% static "images/navbar/navbar_discordjoin.svg" %}" alt="Join us on Discord!"/>
- </a>
</div>
</nav>