diff --git a/src/pretix/presale/static/pretixpresale/js/ui/main.js b/src/pretix/presale/static/pretixpresale/js/ui/main.js index 80a496acc..5298663db 100644 --- a/src/pretix/presale/static/pretixpresale/js/ui/main.js +++ b/src/pretix/presale/static/pretixpresale/js/ui/main.js @@ -5,6 +5,11 @@ $(function () { $($(this).attr("data-parent")).find(".collapse.in").collapse('hide'); $($(this).attr("data-target")).collapse('show'); }); + $(".js-only").removeClass("js-only"); + $(".variations").hide(); + $("a[data-toggle=variations]").click(function() { + $(this).parent().parent().parent().find(".variations").slideToggle(); + }); }); diff --git a/src/pretix/presale/static/pretixpresale/less/event.less b/src/pretix/presale/static/pretixpresale/less/event.less index 8a76ffa8c..42d6d98ae 100644 --- a/src/pretix/presale/static/pretixpresale/less/event.less +++ b/src/pretix/presale/static/pretixpresale/less/event.less @@ -1,11 +1,7 @@ .product-row { border-top: 1px solid @table-border-color; - &.headline, &.simple { - border-top: 2px solid @table-border-color; - } &:last-child { - border-bottom: 2px solid @table-border-color; } p:last-child { margin-bottom: 0; @@ -25,6 +21,12 @@ } } } +.item-with-variations .product-row.headline, .product-row.simple { + border-top: 2px solid @table-border-color; +} +.item-with-variations:last-child { + border-bottom: 2px solid @table-border-color; +} .panel-body address:last-child { margin-bottom: 0; diff --git a/src/pretix/presale/static/pretixpresale/less/main.less b/src/pretix/presale/static/pretixpresale/less/main.less index c5c342be5..1666d57f2 100644 --- a/src/pretix/presale/static/pretixpresale/less/main.less +++ b/src/pretix/presale/static/pretixpresale/less/main.less @@ -17,4 +17,7 @@ footer { position: absolute; right: 0; bottom: 20px; +} +.js-only { + display: none; } \ No newline at end of file diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index a19c8e480..6bfee2f36 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -38,38 +38,54 @@ {% if tup.0 %}
{{ item.short_description }}
{% endif %} -{{ item.short_description }}
{% endif %}