aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2019-04-20 14:56:37 +0100
committerGravatar Gareth Coles <[email protected]>2019-04-20 14:56:37 +0100
commit0b6f16c023e587894def1e6e06913466a5af46bb (patch)
treea4c7df929d9912f15967179d0d2b94bba7ae6a54 /pydis_site
parentbase.html: Load tags on multiple lines (diff)
Styling fixes and cleanup
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/static/css/wiki/style.css12
-rw-r--r--pydis_site/templates/base/navbar.html1
-rw-r--r--pydis_site/templates/wiki/article.html4
-rw-r--r--pydis_site/templates/wiki/base.html9
-rw-r--r--pydis_site/templates/wiki/includes/article_menu.html2
5 files changed, 15 insertions, 13 deletions
diff --git a/pydis_site/static/css/wiki/style.css b/pydis_site/static/css/wiki/style.css
index c5dbd7c3..db6b4050 100644
--- a/pydis_site/static/css/wiki/style.css
+++ b/pydis_site/static/css/wiki/style.css
@@ -1,3 +1,15 @@
+#wikiNavbar {
+ min-height: 3rem;
+}
+
+#wikiNavbar .container {
+ min-height: 3rem;
+}
+
+#wikiNavbar .navbar-brand {
+ min-height: 3rem;
+}
+
.breadcrumb-section {
padding: 1rem;
}
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index 5e76b3a6..bee503ee 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -1,4 +1,3 @@
-{% load extra_filters %}
{% load static %}
<nav class="navbar is-primary" role="navigation" aria-label="main navigation">
diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
index 890e4300..7f2b3af6 100644
--- a/pydis_site/templates/wiki/article.html
+++ b/pydis_site/templates/wiki/article.html
@@ -22,7 +22,3 @@
</div>
</div>
{% endblock %}
-
-{% block wiki_footer_prepend %}
- <p style="margin-bottom: 10px;"><em>This article was last modified: {{ article.current_revision.modified }}</em></p>
-{% endblock %}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index c47f6bfb..f1b70fdd 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -16,11 +16,12 @@
<link rel="stylesheet" href="{% static "css/wiki/simplemde.min.css" %}">
<link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
<link rel="stylesheet" href="{% static "css/wiki/style.css" %}">
+ <link rel="stylesheet" href="{% static "css/home/index.css" %}">
{% endblock %}
{% block content %}
{% block site_navbar %}
- {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
+ {% include "base/navbar.html" %}
{% endblock %}
{% block wiki_navbar %}{% endblock %}
@@ -41,12 +42,6 @@
</section>
{% endblock %}
- {% block site_footer %}
- {% block wiki_footer_prepend %}{% endblock %}
-
- {{ block.super }}
- {% endblock %}
-
<script src="{% static "js/wiki/dropdown.js" %}" type="text/javascript"></script>
<script src="{% static "js/wiki/load_editor.js" %}" type="text/javascript"></script>
{% endblock %}
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 473df483..966e8120 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -2,7 +2,7 @@
{% if article|can_write:user %}
{% with selected_tab as selected %}
- <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
+ <nav class="navbar is-light" role="navigation" aria-label="wiki navigation" id="wikiNavbar">
<div class="container">
<div class="navbar-brand">
{% if not user.is_anonymous %}