Skip to content
Snippets Groups Projects
Commit 24adf7b2 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

Merge branch 'test' of gitlab.pirati.cz:to/majak into feat/personal-calendars

parents 3a481d7f 538b6f38
No related branches found
No related tags found
2 merge requests!787Release,!749Add personal calendars, move from requests-cache to Django cache
Pipeline #12368 passed
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
{% endif %} {% endif %}
<div class="card elevation-3"> <div class="card elevation-3">
<div class="card__body"> <div class="card__body">
{% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person title=item.value.position %} {% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
{{ article.title }} {{ article.title }}
</h1> </h1>
</a> </a>
<p class="card-body-text flex-grow{% if article.is_black %} bg-black{% endif %}"> <p class="card-body-text text-ellipsis overflow-hidden h-64 flex-grow{% if article.is_black %} bg-black{% endif %}">
{{ article.perex }} {{ article.perex }}
</p> </p>
<div class="inline-block-nogap mt-4"> <div class="inline-block-nogap mt-4">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment