diff options
| author | Christian Cleberg <hello@cleberg.net> | 2024-03-29 01:49:34 -0500 |
|---|---|---|
| committer | Christian Cleberg <hello@cleberg.net> | 2024-03-29 01:49:34 -0500 |
| commit | a88f36d8a32384614ebf5508ae702315e009458a (patch) | |
| tree | 306b3e42bb4a8d07d51a45ff1c53707085722161 /theme | |
| parent | 00b2726e0561f174393ae600f0f11adb8afebaab (diff) | |
| download | cleberg.net-a88f36d8a32384614ebf5508ae702315e009458a.tar.gz cleberg.net-a88f36d8a32384614ebf5508ae702315e009458a.tar.bz2 cleberg.net-a88f36d8a32384614ebf5508ae702315e009458a.zip | |
clean up remaining markdown files and merge conflicts
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/templates/index.html | 14 | ||||
| -rw-r--r-- | theme/templates/wiki.html | 15 |
2 files changed, 0 insertions, 29 deletions
diff --git a/theme/templates/index.html b/theme/templates/index.html index 923d920..924335c 100644 --- a/theme/templates/index.html +++ b/theme/templates/index.html @@ -7,19 +7,6 @@ </section> <section> <h2>Recent Blog Posts</h2> -<<<<<<< HEAD:templates/index.html - {% set section = get_section(path="blog/_index.md") %} - {% set i = 0 %} - {% for page in section.pages %} - {% if i < 3%} - {% set_global i = i + 1%} - <div class="post"> - <time datetime="{{ page.date | date(format='%Y-%m-%d %H:%M:%S') }}">{{ page.date | date(format='%Y-%m-%d') }}</time> - <a href="/blog/{{ page.slug }}/">{{ page.title }}</a> - </div> - {% endif %} - {% endfor %} -======= <div class="post"> <time datetime="2024-03-15"><2024-03-15></time> <a href="/blog/self-hosting-ddns-updater.html">Self-Hosting DDNS Updater</a> @@ -32,7 +19,6 @@ <time datetime="2024-02-21"><2024-02-21></time> <a href="/blog/self-hosting-an-otter-wiki.html">Self-Hosting An Otter Wiki</a> </div> ->>>>>>> org:theme/templates/index.html <br> <a href="/blog/">All Posts →</a> </section> diff --git a/theme/templates/wiki.html b/theme/templates/wiki.html index ead64c4..3d8b8fd 100644 --- a/theme/templates/wiki.html +++ b/theme/templates/wiki.html @@ -1,27 +1,13 @@ {% extends "base.html" %} -<<<<<<< HEAD:templates/wiki.html -{% block content %} -<h1>{{ section.title }}</h1> -======= {% block subtitle %}Wiki | {% endblock %} {% block main %} <h1>Wiki</h1> ->>>>>>> org:theme/templates/wiki.html <p>Use <code>Ctrl + F</code> to search wiki pages for keywords.</p> <div class="wiki-post"> <p>Wiki Page</p> <p>Last Updated</p> </div> -<<<<<<< HEAD:templates/wiki.html -{% for page in section.pages %} - <div class="wiki-post"> - <p><a href="/wiki/{{ page.slug }}/">{{ page.title }}</a></p> - <time datetime="{{ page.updated | date(format='%Y-%m-%d %H:%M:%S') }}">{{ page.updated | date(format='%Y-%m-%d')}}</p> - </div> -{% endfor %} -{% endblock content %} -======= {% for post in posts %} <div class="wiki-post"> <a href="{{ url_for("wiki", slug=post.slug) }}">{{ post.title }}</a> @@ -29,4 +15,3 @@ </div> {% endfor %} {% endblock %} ->>>>>>> org:theme/templates/wiki.html |