From 3e178a72934fc34530c90e1b97b556b88530ce3f Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 7 Jun 2021 12:52:25 +0200 Subject: [PATCH] Calendar: Fix hide/show of selected day contents --- .../templates/pretixpresale/fragment_calendar.html | 2 +- src/pretix/static/pretixpresale/js/ui/main.js | 2 +- src/pretix/static/pretixpresale/scss/_calendar.scss | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html index c670d48221..9092064843 100644 --- a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html +++ b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html @@ -107,7 +107,7 @@ {% endfor %} {% endfor %} - + diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js index e9fb92479f..97e3d526c1 100644 --- a/src/pretix/static/pretixpresale/js/ui/main.js +++ b/src/pretix/static/pretixpresale/js/ui/main.js @@ -321,7 +321,7 @@ $(function () { var $tr = $(this).closest(".table-calendar").find(".selected-day"); $tr.find("td").html($(this).find(".events").html()); $tr.find("td").prepend($("

").text($(this).attr("data-date"))); - $tr.show(); + $tr.removeClass("hidden"); }); $(".print-this-page").on("click", function (e) { diff --git a/src/pretix/static/pretixpresale/scss/_calendar.scss b/src/pretix/static/pretixpresale/scss/_calendar.scss index da0684c9fe..10a9465f23 100644 --- a/src/pretix/static/pretixpresale/scss/_calendar.scss +++ b/src/pretix/static/pretixpresale/scss/_calendar.scss @@ -69,9 +69,6 @@ background: darken($brand-primary, 15%); } } - .selected-day { - display: none; - } } .week-calendar { .weekday { @@ -123,6 +120,13 @@ } } } +@media (min-width: $screen-sm-min) { + .table-calendar, .week-calendar { + .selected-day { + display: none !important; + } + } +} @media (max-width: $screen-xs-max) { .table-calendar .day .events { display: none;