infrastructure/conference-website
1
1
Fork 1
Code Issues 14 Pull Requests Releases Activity

UI: Conference website web-assets v2 upgrade #103970

Merged
Márton Lente merged 50 commits from ui/web-assets-v2-update into main 2024-09-23 12:34:43 +02:00
Conversation 20 Commits 50 Files Changed 47 +12 -5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a8978a71f - Show all commits

7
conference_main/static/conference_main/styles/main.sass
View File

@ -227,3 +227,10 @@ button.going-star
.form-check-input .form-check-input
transform: scale(1.5) translateX(calc(var(--spacer) * -1)) transform: scale(1.5) translateX(calc(var(--spacer) * -1))
// TODO: check and cleanup style definition in Web Assets
.table-no-box
tr
td
padding-left: var(--spacer) !important
padding-right: var(--spacer) !important

6
conference_main/templates/conference_main/presentations/account_list.pug
View File

@ -8,10 +8,10 @@ table.table-no-box
tbody tbody
| {% for o in object_list %} | {% for o in object_list %}
tr tr
td(style="width: 4ch; padding-right: 0") td(style="width: 4ch;")
span.text-muted {{ o.edition.year }} span.text-muted.text-nowrap {{ o.edition.year }}
td td
a(href="{% url 'presentation_detail' edition_path=o.edition.path pk=o.pk %}") a.px-0(href="{% url 'presentation_detail' edition_path=o.edition.path pk=o.pk %}")
| {{ o.name }} | {{ o.name }}
td.text-right td.text-right
span.badge.badge-primary( span.badge.badge-primary(

4
tickets/templates/tickets/ticket_list.html
View File

@ -12,14 +12,14 @@
<tr> <tr>
{% is_claimed_by ticket request.user as clamed %} {% is_claimed_by ticket request.user as clamed %}
<td> <td>
<a href="{{ detail_url }}"> <a class="px-0" href="{{ detail_url }}">
{{ ticket.edition }} ({{ ticket.sku }}) {{ ticket.edition }} ({{ ticket.sku }})
{% if clamed %} {% if clamed %}
(claimed by you) (claimed by you)
{% endif %} {% endif %}
</a> </a>
</td> </td>
<td><a href="{{ detail_url }}">{% include "tickets/components/pill_payment_status.html" %}</a></td> <td><a class="px-0" href="{{ detail_url }}">{% include "tickets/components/pill_payment_status.html" %}</a></td>
<td>{% include "tickets/ticket_detail_invoice.html" %}</td> <td>{% include "tickets/ticket_detail_invoice.html" %}</td>
</tr> </tr>
{% endfor %} {% endfor %}