Skip to content

Commit

Permalink
Merge pull request #325 from danesjenovdan/v3-dev
Browse files Browse the repository at this point in the history
Pulling refs/heads/v3-dev into v3-k8s
  • Loading branch information
LepkoQQ authored Sep 30, 2024
2 parents 92be1f1 + 83c04b6 commit 30ebe48
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion css-compile/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module.exports = {
},
extend: {
gridTemplateColumns: {
fill210: 'repeat(auto-fill, minmax(210px, 1fr))',
fill240: 'repeat(auto-fill, minmax(240px, 1fr))',
fill290: 'repeat(auto-fill, minmax(290px, 1fr))',
},
animation: {
Expand Down
2 changes: 1 addition & 1 deletion djnd/djnd/templates/includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
<div class="mt-4 leading-5">
<a href="mailto:vsi@danesjenovdan.si">vsi@danesjenovdan.si</a><br>
<a href="tel:+38664163663">+386 64 163 663</a> (med 10. in 16. uro)
<a href="tel:+38664163663">+386 64 163 663</a> {% translate "(med 10. in 16. uro)" %}
</div>
<div class="flex flex-wrap gap-5 mt-6">
<a class="shrink-0 transition-all duration-150 hover:scale-110" target="_blank" href="https://mas.to/@danesjenovdan"><img class="w-8 h-8" src="{% static "img/social/mastodon.svg" %}" alt="Mastodon"></a>
Expand Down
4 changes: 2 additions & 2 deletions djnd/home/templates/home/team_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ <h1 class="mb-12 text-5xl font-semibold xl-max:text-2xl sm-max:mb-6">{{ page.tit
})
</script>

<div class="grid grid-cols-fill210 gap-4">
<div class="grid grid-cols-fill240 gap-4">
{% for member in team_members %}
<div class="border" data-member-id="{{ member.id }}" data-category-ids="{{ member|get_translated_m2m_ids:"category" }}">
<div class="border-b">
{% image member.image fill-300x300 class="w-full aspect-square" %}
{% image member.image fill-560x560 class="w-full aspect-square" %}
</div>
<div class="p-4">
<h2 class="text-3lg font-semibold xl-max:text-lg/[1.15]">{{ member.name }}</h2>
Expand Down
2 changes: 1 addition & 1 deletion djnd/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ msgstr "Inštitut za druga vprašanja"

#: home/templates/home/blocks/contact_block.html:23
msgid "(med 10. in 16. uro)"
msgstr "(10.00–16.00)"
msgstr "(10:00–16:00)"

#: home/templates/home/blocks/contact_block.html:28
#: home/templates/home/blocks/newsletter_block.html:8
Expand Down

0 comments on commit 30ebe48

Please sign in to comment.