bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Patrick Mayr
2022-03-19 16:06:24 +00:00
parent bb8174400a
commit 492767aadb
2 changed files with 4132 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4132
fet2020/static/css/styles.css~HEAD Normal file
View File

File diff suppressed because it is too large Load Diff

4
fet2020/templates/posts/partials/_posts_hero_compact.html
View File

@@ -2,11 +2,7 @@
<a href="{{ post.url }}" class="block p-4">
<div class="float-right px-2 py-0.5 rounded-full text-sm font-medium text-proprietary dark:text-blue-100 bg-blue-200 dark:bg-proprietary-dark">
<i class="fa-solid fa-calendar-days mr-1"></i>
<<<<<<< HEAD
<p style="margin-bottom: 0rem;">{{ post.date|date:"d. F Y" }}</p>
=======
<p>{{ post.date|date:"d. F Y" }}</p>
>>>>>>> fix merge conflicts again........
</div>
<h3 class="text-gray-800 dark:text-gray-200 leading-relaxed">{{ post.title|safe|truncatechars:60 }}</h3>
</a>