1

Merge remote-tracking branch 'origin/edit-User' into edit-User

# Conflicts:
#	src/main/resources/templates/index.html
This commit is contained in:
kasch309
2020-03-18 16:18:14 +01:00
5 changed files with 43 additions and 20 deletions

View File

@ -40,8 +40,8 @@
<div th:each="gruppe: ${gruppen}">
<div class="shadow-sm p-4" style="border: none; background: aliceblue">
<h3 style="color: black; font-weight: bold;">
<a th:href="@{/gruppen2/details(id=${gruppe.getId()})}" th:text="${gruppe.getTitle()}"></a>
<h3 style="color: dodgerblue; font-weight: bold;">
<a th:href="@{/gruppen2/details/{id}(id=${gruppe.getId()})}" th:text="${gruppe.getTitle()}"></a>
</h3>
<div class="shadow-sm p-4" style="background: white">
<p style="overflow-wrap: break-word" th:text="${#strings.abbreviate(gruppe.getDescription(),300)}"></p>