summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-08-07 20:42:39 +0200
committerJohannes Löthberg <johannes@kyriasis.com>2016-08-07 20:42:39 +0200
commit8ae7c7a1f817f31d41852a54aaa4f26509c0ebb3 (patch)
tree5b793a23d2db9dbd1d0df3586d06c24036241a35
parent1f8bbfd2ea30b11c4627546462f47f1c01113713 (diff)
downloadwebsite-8ae7c7a1f817f31d41852a54aaa4f26509c0ebb3.tar.xz
Revamp something
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--src/style.css2
-rw-r--r--src/templates/entry.html16
-rw-r--r--src/templates/journal.html14
-rw-r--r--src/templates/nav-journal.htmlvi8
4 files changed, 13 insertions, 27 deletions
diff --git a/src/style.css b/src/style.css
index 405b187..aac5d1c 100644
--- a/src/style.css
+++ b/src/style.css
@@ -54,7 +54,7 @@ header h1 {
margin: 0;
}
-.entry, .botborder {
+.entry {
margin-bottom: 1rem;
border-bottom: 0.15rem;
border-bottom-style: dotted;
diff --git a/src/templates/entry.html b/src/templates/entry.html
index 83dad5a..fe4cbfc 100644
--- a/src/templates/entry.html
+++ b/src/templates/entry.html
@@ -22,23 +22,19 @@
<time itemprop="datePublished" datetime="{{ page.date.strftime('%Y-%m-%d') }}">
{{ page.date.strftime('%Y-%m-%d') }}
</time>
+ </div>
+
+ {{ page.body }}
+ <div class="botinfo">
<span itemprop="author" itemscope itemtype="http://schema.org/Person">
{% if page.author_link %}
- by <a itemprop="name" rel="author" href="{{ page.author_link }}">{{ page.author }}</a>
+ — <a itemprop="name" rel="author" href="{{ page.author_link }}">{{ page.author }}</a>
{% else %}
- by {{ page.author }}
+ — {{ page.author }}
{% endif %}
</span>
</div>
-
- {{ page.body }}
</article>
- <script data-isso="https://theos.kyriasis.com/isso/"
- data-isso-css="false"
- data-isso-vote="true"
- src="https://theos.kyriasis.com/isso/js/embed.min.js"></script>
- <section id="isso-thread" class="botborder"></section>
-
{% endblock content %}
diff --git a/src/templates/journal.html b/src/templates/journal.html
index 36abb93..6e673a2 100644
--- a/src/templates/journal.html
+++ b/src/templates/journal.html
@@ -16,21 +16,19 @@
<time itemprop="datePublished" datetime="{{ entry.date.strftime('%Y-%m-%d') }}">
{{ entry.date.strftime('%Y-%m-%d') }}
</time>
+ </div>
+
+ {{ entry.body }}
+ <div class="botinfo">
<span itemprop="author" itemscope itemtype="http://schema.org/Person">
{% if entry.author_link %}
- by <a itemprop="name" rel="author" href="{{ entry.author_link }}">{{ entry.author }}</a>
+ — <a itemprop="name" rel="author" href="{{ entry.author_link }}">{{ entry.author }}</a>
{% else %}
- by {{ entry.author }}
+ — {{ entry.author }}
{% endif %}
</span>
</div>
-
- {{ entry.body }}
-
- <div class="botinfo">
- <a href="journal/{{ entry.page }}#isso-thread">comments</a>
- </div>
</article>
{% endfor %}
{% endblock content %}
diff --git a/src/templates/nav-journal.htmlvi b/src/templates/nav-journal.htmlvi
deleted file mode 100644
index a5c5717..0000000
--- a/src/templates/nav-journal.htmlvi
+++ /dev/null
@@ -1,8 +0,0 @@
-<nav>
- <ul>
- <li><a href="/~kyrias/index.html">~kyrias</a></li>
- <li><a href="/~kyrias/journal.html">journal</a></li>
- <li><a href="/~kyrias/about.html">about</a></li>
- <li><a href="http://git.kyriasis.com/kyrias/website">source</a></li>
- </ul>
-</nav>