upstream/2025.5.0 #5

Merged
philipp merged 197 commits from upstream/2025.5.0 into master 2025-06-03 16:12:50 +00:00
2 changed files with 11 additions and 3 deletions
Showing only changes of commit e6ec4cb435 - Show all commits
@@ -7,7 +7,7 @@
{% load rich_text %}
{% for tup in items_by_category %}{% with category=tup.0 items=tup.1 form_prefix=tup.2 %}
{% if category %}
<section aria-labelledby="{{ form_prefix }}category-{{ category.id }}"{% if category.description %} aria-describedby="{{ form_prefix }}category-info-{{ category.id }}"{% endif %}>
<section class="item-category" aria-labelledby="{{ form_prefix }}category-{{ category.id }}"{% if category.description %} aria-describedby="{{ form_prefix }}category-info-{{ category.id }}"{% endif %}>
<h{{ headline_level|default:3 }} class="h3" id="{{ form_prefix }}category-{{ category.id }}">{{ category.name }}
{% if category.subevent_name %}
<small class="text-muted"><i class="fa fa-calendar" aria-hidden="true"></i> {{ category.subevent_name }}</small>
@@ -24,7 +24,7 @@
<div id="{{ form_prefix }}category-info-{{ category.id }}">{{ category.description|localize|rich_text }}</div>
{% endif %}
{% else %}
<section aria-labelledby="{{ form_prefix }}category-none">
<section class="item-category" aria-labelledby="{{ form_prefix }}category-none">
<h{{ headline_level|default:"3" }} id="{{ form_prefix }}category-none" class="h3 sr-only">{% trans "Uncategorized items" %}</h{{ headline_level|default:3 }}>
{% endif %}
{% for item in items %}
@@ -1,10 +1,18 @@
h1, .h1,
h2, .h2,
h3, .h3 {
margin-top: 2.25 * $line-height-computed;
margin-top: 0.75 * $line-height-computed;
margin-bottom: 0.75 * $line-height-computed;
}
.front-page, .item-category {
h1, .h1,
h2, .h2,
h3, .h3 {
margin-top: 2.25 * $line-height-computed;
}
}
.page-header {
position: relative;
padding-bottom: 9px;