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

fix merge conflicts again........

Browse Source
This commit is contained in:
Patrick Mayr
2022-03-06 12:51:39 +00:00
parent bcffe6a683
commit a4224dca6a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/templates/home.html
View File

@@ -91,7 +91,7 @@
</span> </span>
<i class="fab fa-discord text-4xl"></i> <i class="fab fa-discord text-4xl"></i>
</div> </div>
<a href="https://discord.fet.at/" class="flex-1"> <a href="{% url 'discord' %}" class="flex-1">
FET Discord-Server<br> FET Discord-Server<br>
<span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span> <span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span>
</a> </a>

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

@@ -2,7 +2,11 @@
<a href="{{ post.url }}" class="block p-4"> <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"> <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> <i class="fa-solid fa-calendar-days mr-1"></i>
<<<<<<< HEAD
<p style="margin-bottom: 0rem;">{{ post.date|date:"d. F Y" }}</p> <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> </div>
<h3 class="text-gray-800 dark:text-gray-200 leading-relaxed">{{ post.title|safe|truncatechars:60 }}</h3> <h3 class="text-gray-800 dark:text-gray-200 leading-relaxed">{{ post.title|safe|truncatechars:60 }}</h3>
</a> </a>