aboutsummaryrefslogtreecommitdiff
path: root/crumbs/templates
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2018-01-22 22:46:46 +0100
committerKatharina Fey <kookie@spacekookie.de>2018-01-22 22:46:46 +0100
commit6030c88e98ab643ced4f706b680091322f4d4d77 (patch)
treefb3564324036b02d292a290eee6320c23ed02273 /crumbs/templates
parentf9a1509375bb1e05365c0a913efd8babab3ef362 (diff)
Deleting old CSS. Cleaning up project. OMG so many changes
Diffstat (limited to '')
-rwxr-xr-xcrumbs/templates/base.html9
-rw-r--r--crumbs/templates/components/html_head.html3
-rw-r--r--crumbs/templates/components/navbar_generator.html8
-rwxr-xr-xcrumbs/templates/home.html10
-rw-r--r--crumbs/templates/normal.html7
5 files changed, 22 insertions, 15 deletions
diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html
index e28af28..dd8226d 100755
--- a/crumbs/templates/base.html
+++ b/crumbs/templates/base.html
@@ -4,10 +4,19 @@
{% block head %}
{% endblock head %}
+ {% block body %}
<body>
<div class="container">
{% block wrapped %}
{% endblock %}
+
+ {# This can be used for a footer #}
+ <div>
+ {% block footer %}
+ {% endblock %}
+ </div>
+
</div>
</body>
+ {% endblock %}
</html>
diff --git a/crumbs/templates/components/html_head.html b/crumbs/templates/components/html_head.html
index 3499ffa..dc34ab3 100644
--- a/crumbs/templates/components/html_head.html
+++ b/crumbs/templates/components/html_head.html
@@ -4,11 +4,10 @@
{% if type == 'home' %}
<link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
- <link href="{{ SITEURL }}/theme/css/cr_title.css" rel="stylesheet">
+ <link href="{{ SITEURL }}/theme/css/cr_title.css" rel="stylesheet"> {# This contains various overrides #}
{% else %}
<link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
<link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
- <link href="{{ SITEURL }}/theme/css/cr_gay_override.css" rel="stylesheet">
{% endif %}
<link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500;subset=cyrillic,latin-ext" rel="stylesheet">
diff --git a/crumbs/templates/components/navbar_generator.html b/crumbs/templates/components/navbar_generator.html
new file mode 100644
index 0000000..07121ca
--- /dev/null
+++ b/crumbs/templates/components/navbar_generator.html
@@ -0,0 +1,8 @@
+<div class="navigation">
+ {% if type == 'home' %}
+ {% include "components/link_generator.html" %}
+ {% else %}
+ {% with title_type='page-title' %} {% include "components/title_text.html" %} {% endwith %}
+ {% include "components/link_generator.html" %}
+ {% endif %}
+</div>
diff --git a/crumbs/templates/home.html b/crumbs/templates/home.html
index 70cd2cc..ef11073 100755
--- a/crumbs/templates/home.html
+++ b/crumbs/templates/home.html
@@ -7,20 +7,16 @@
{% endwith %}
{% endblock head %}
-
{% block wrapped %}
- <div class="navigation">
- {% include "components/link_generator.html" %}
- </div>
-
+ {% with type='home' %} {% include "components/navbar_generator.html" %} {% endwith %}
{% with title_type='title' %} {% include "components/title_text.html" %} {% endwith %}
{% include "components/super_gay.html" %}
<p>
- <b>Hi – </b>Welcome to my dusty internet hangout place.
+ <strong>Hi – </strong>Welcome to my dusty internet hangout place.
</p>
<p>
- My name is <b>Katharina Fey</b> and I'm a software developer from Berlin.
+ My name is <strong>Katharina Fey</strong> and I'm a software developer from Berlin.
I like taking photos, writing stories and starting way too many personal projects.
</p>
diff --git a/crumbs/templates/normal.html b/crumbs/templates/normal.html
index 40a51b4..069e863 100644
--- a/crumbs/templates/normal.html
+++ b/crumbs/templates/normal.html
@@ -8,12 +8,7 @@
{% endblock head %}
{% block wrapped %}
- <div class="navigation">
- {% with title_type='page-title' %} {% include "components/title_text.html" %} {% endwith %}
- {% include "components/link_generator.html" %}
- </div>
-
- {# Include the colour bar as a divider #}
+ {% with type='normal' %} {% include "components/navbar_generator.html" %} {% endwith %}
{% include "components/super_gay.html" %}
<h1>{% block title %}{% endblock %}</h1>