diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html index 9c86509f37..7d8400951a 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html @@ -2,15 +2,15 @@ {% load icon %} {% load eventurl %} -
+
{% for subev in subevent_list.subevent_list %} -
-
- +
-
+ +

{{ subev.get_date_range_display_as_html }} {% if event.settings.show_times %}
@@ -20,13 +20,13 @@ {% endif %} -

-
+

+

{% include "pretixpresale/fragment_event_list_status.html" with event=subev %} -

-
+

+

{% if subev.presale_is_running and subev.best_availability_state == 100 %} {% icon "ticket" %} {% trans "Tickets" %} @@ -34,7 +34,7 @@ {% icon "info" %} {% trans "More info" %} {% endif %} -

-
+

+ {% endfor %} -
+ diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html index 8ca115a708..3638e26efd 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/index.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html @@ -46,11 +46,11 @@ {% endif %} {% if events %}
-
+
{% for e in events %}{% eventurl e "presale:event.index" as url %} -
-
{{ e.name }}
-
+
+

{{ e.name }}

+

{% if e.settings.show_dates_on_frontpage %} {% if e.has_subevents %} {% icon "calendar" %} {% trans "Multiple dates" context "subevent" %} @@ -78,13 +78,13 @@ {% else %}   {% endif %} -

-
+

+

{% include "pretixpresale/fragment_event_list_status.html" with event=e %} -

-
+

+

{% if e.has_subevents %}{% icon "ticket" %} {% trans "Tickets" %} {% elif e.presale_is_running and e.best_availability_state == 100 %} @@ -93,10 +93,10 @@ {% icon "info" %} {% trans "More info" %} {% endif %} -

-
+

+ {% endfor %} -
+

{% endif %} diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss index 33f939e308..aa153ce20a 100644 --- a/src/pretix/static/pretixpresale/scss/main.scss +++ b/src/pretix/static/pretixpresale/scss/main.scss @@ -593,22 +593,15 @@ h2 .label { display: none !important; } -.event-list { - margin-bottom: 15px; - border-top: 1px solid $table-border-color; - - .row { - margin-left: 0; - margin-right: 0; - padding-top: 5px; - padding-bottom: 5px; - border-bottom: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; - border-right: 1px solid $table-border-color; +.event-list.full-width-list { + h3, p { + margin-top: 0; + margin-bottom: 0; } - .row > div { - padding-top: 5px; - padding-bottom: 5px; + h3 { + font-size: 1em; + line-height: 1.25rem; + font-weight: bold; } }