1

Merge remote-tracking branch 'origin/master' into max_userNumber

# Conflicts:
#	src/main/resources/templates/editMembers.html
This commit is contained in:
killerber4t
2020-03-19 15:55:59 +01:00
10 changed files with 38 additions and 26 deletions

View File

@ -31,8 +31,7 @@
<main th:fragment="bodycontent">
<div class="container-fluid">
<div class="row">
<div class="col-9 shadow-sm p-4"
style="border: 10px solid aliceblue; background: aliceblue">
<div class="col-9 shadow-sm p-4" style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
<h1 style="color: black; font-weight: bold" th:text="${group.getTitle()}"></h1>
<h3>
<span class="badge badge-pill badge-dark" style="background: darkslategray"