aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Nikolai Viessmann2020-07-27 10:50:38 +0200
committerHans-Nikolai Viessmann2020-07-27 10:50:38 +0200
commitc53f49542d8c3a7bb1675d0a2364bd60c610a31a (patch)
treeecf8aba151bbc40abc9f605a7a4a9d61b1df24d8
parent472c3968d5d177f9de3a9f1a058238eb13b38fe9 (diff)
downloadpelican-theme-edream-c53f49542d8c3a7bb1675d0a2364bd60c610a31a.tar.gz
pelican-theme-edream-c53f49542d8c3a7bb1675d0a2364bd60c610a31a.zip
move away from dedicated project page, fix imgs
-rw-r--r--static/css/main.css16
-rw-r--r--templates/base.html10
-rw-r--r--templates/category.html13
-rw-r--r--templates/index.html2
-rw-r--r--templates/projects.html13
-rw-r--r--templates/tag.html13
6 files changed, 32 insertions, 35 deletions
diff --git a/static/css/main.css b/static/css/main.css
index f381f83..cb33254 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -29,19 +29,27 @@ div .section {
}
.content .figure:not(:first-child) {
- margin-top: 2em;
+ margin-top: 2em;
}
.content .figure:not(:last-child) {
- margin-bottom: 2em;
+ margin-bottom: 2em;
}
.content .figure img {
- display: inline-block;
+ display: inline-block;
}
.content .figure .caption {
- font-style: italic;
+ font-style: italic;
+}
+
+/* better handling of img tag */
+p img {
+ display: block;
+ position: relative;
+ height: auto;
+ width: 100%;
}
/* Special handling for aside-menu */
diff --git a/templates/base.html b/templates/base.html
index 9545292..0bccf82 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -50,7 +50,7 @@ at the humans.txt file at https://blog.viess.mn/humans.txt for more information.
<div id="menu-top" class="menu">
<ul class="menu-list has-text-weight-medium">
<li><a href="#">About Me</a></li>
- <li><a href="/pages/projects/">Projects</a></li>
+ <li><a href="/category/project/">Projects</a></li>
<li><a href="/pages/links/">Links</a></li>
</ul>
</div>
@@ -69,15 +69,15 @@ at the humans.txt file at https://blog.viess.mn/humans.txt for more information.
<div id="menu-aside" class="menu">
<ul class="menu-list has-text-weight-medium">
<li><a href="#">About Me</a></li>
- <li><a href="/pages/projects/">Projects</a></li>
+ <li><a href="/category/project/">Projects</a></li>
<li><a href="/pages/links/">Links</a></li>
</ul>
</div>
</div>
</div>
<div class="column mt-1">
- {% block content -%}
- {%- endblock content %}
+ {% block content -%}
+ {%- endblock content %}
</div>
</div>
</main>
@@ -96,7 +96,7 @@ at the humans.txt file at https://blog.viess.mn/humans.txt for more information.
<a href="//www.w3.org/html/"><img src="//www.w3.org/html/logo/badge/html5-badge-h-css3-semantics.png" width="83" height="33" alt="HTML5 Powered with CSS3 / Styling, and Semantics" title="HTML5 Powered with CSS3 / Styling, and Semantics"></a>
<a rel="license" href="//creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a>
</div>
- <div class="my-2"><a href="{{ SITEURL }}">blog</a> &mdash; <a href="/pages/about-me/">about me</a> &mdash; <a href="/tags.html">tags</a> &mdash; <a href="/categories.html">categories</a> &mdash; <a href="/pages/projects/">projects</a> &mdash; <a href="/pages/links/">links</a> &mdash; <a href="/pages/acknowledgements/">acknowledgements</a></div>
+ <div class="my-2"><a href="{{ SITEURL }}">blog</a> &mdash; <a href="/pages/about-me/">about me</a> &mdash; <a href="/tags.html">tags</a> &mdash; <a href="/categories.html">categories</a> &mdash; <a href="/category/project/">projects</a> &mdash; <a href="/pages/links/">links</a> &mdash; <a href="/pages/acknowledgements/">acknowledgements</a></div>
</div>
</div>
</div>
diff --git a/templates/category.html b/templates/category.html
index 2c4a99a..7ad2764 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,12 +1,13 @@
{% extends "base.html" %}
-{% block title %}{{ category }} - {{ SITENAME }}{% endblock %}
+{% block title %}Category {{ category }}s - {{ SITENAME }}{% endblock %}
+{% block page_title %}{{ category.name.capitalize() }}s{% endblock %}
{% block content %}
-<h1 class="title">{{ category.name.capitalize() }}</h1>
-<h2 class="subtitle">Article Category</h2>
-<ol>
+<ul>
{% for article in articles %}
- {% include 'article_link.inc.html' %}
+ <li class="py-2">
+ {% include 'article_link.inc.html' %}
+ </li>
{% endfor %}
-</ol>
+</ul>
{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 3e4bf9a..d72946d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
{% block content %}
<ul>
-{% for article in articles %}
+{% for article in articles if article.category.name != 'project' %}
<li class="py-2">
{% include 'article_link.inc.html' %}
</li>
diff --git a/templates/projects.html b/templates/projects.html
deleted file mode 100644
index 7b7074b..0000000
--- a/templates/projects.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Projects - {{ SITENAME }}{% endblock %}
-{% block page_title %}Projects{% endblock %}
-
-{% block content %}
-<ul>
-{% for article in articles if article.category.name == 'project' %}
- <li>
- {% include 'article_link.inc.html' %}
- </li>
-{% endfor %}
-</ul>
-{% endblock %}
diff --git a/templates/tag.html b/templates/tag.html
index 0456e0e..71a9aa7 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,12 +1,13 @@
{% extends "base.html" %}
-{% block title %}{{ tag }} - {{ SITENAME }}{% endblock %}
+{% block title %}Tag {{ tag }} - {{ SITENAME }}{% endblock %}
+{% block page_title %}{{ tag.name.capitalize() }}{% endblock %}
{% block content %}
-<h1 class="title">{{ tag.name.capitalize() }}</h1>
-<h2 class="subtitle">Article Tag</h2>
-<ol>
+<ul>
{% for article in articles %}
- {% include 'article_link.inc.html' %}
+ <li class="py-2">
+ {% include 'article_link.inc.html' %}
+ </li>
{% endfor %}
-</ol>
+</ul>
{% endblock %}