From d80202e35ba62a9d1dc852d1211e8c8a462e19cd Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 2 Apr 2026 21:31:58 -0400 Subject: [PATCH] Style clean up. Making things nicer again. --- .../badges/ae_comp__badge_obj_li.svelte | 114 ++++++++++++------ .../badges/ae_comp__badge_search.svelte | 20 ++- .../ae_comp__event_session_obj_li.svelte | 4 +- 3 files changed, 91 insertions(+), 47 deletions(-) diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte index 211905a1..c8a5f151 100644 --- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte @@ -140,6 +140,9 @@ let visible_badge_obj_li = $derived( event_badge_obj?.full_name_override ?? event_badge_obj?.full_name ?? `${event_badge_obj?.given_name ?? ''} ${event_badge_obj?.family_name ?? ''}`.trim()} + {@const can_print = is_trusted && (!is_printed || is_edit_mode)} + {@const print_href = `/events/${event_badge_obj?.event_id}/badges/${event_badge_obj?.event_badge_id}/print`} + {@const review_href = build_review_url(event_badge_obj)}
  • - -
    - - - {#if event_badge_obj?.hide} - - {:else} - - {/if} - {display_name} - + +
    + {#if can_print} + + {#if event_badge_obj?.hide} + + {:else} + + {/if} - - {#if show_sensitive_fields && event_badge_obj?.email} - - - {is_trusted - ? event_badge_obj.email - : obscure_email(event_badge_obj.email)} - - {/if} +
    + {display_name} - - {#if !hide_affiliations && (event_badge_obj?.affiliations_override ?? event_badge_obj?.affiliations)} - - - {event_badge_obj.affiliations_override ?? - event_badge_obj.affiliations} - + {#if show_sensitive_fields && event_badge_obj?.email} + + + {is_trusted + ? event_badge_obj.email + : obscure_email(event_badge_obj.email)} + + {/if} + + {#if !hide_affiliations && (event_badge_obj?.affiliations_override ?? event_badge_obj?.affiliations)} + + + {event_badge_obj.affiliations_override ?? event_badge_obj.affiliations} + + {/if} +
    +
    + {:else} +
    + {#if event_badge_obj?.hide} + + {:else} + + {/if} + +
    + {display_name} + + {#if show_sensitive_fields && event_badge_obj?.email} + + {is_trusted + ? event_badge_obj.email + : obscure_email(event_badge_obj.email)} + + {/if} + + {#if !hide_affiliations && (event_badge_obj?.affiliations_override ?? event_badge_obj?.affiliations)} + + {event_badge_obj.affiliations_override ?? event_badge_obj.affiliations} + + {/if} +
    +
    {/if} @@ -205,10 +240,11 @@ let visible_badge_obj_li = $derived( {#if is_trusted && (!is_printed || is_edit_mode)} + : `Print badge for ${display_name}`}> {#if is_printed} send_review_email(event_badge_obj)} - title="Email a review link to this attendee"> + title="Email a review link to {display_name}"> diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte index c997e900..f1ee111b 100644 --- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte @@ -82,10 +82,11 @@ function handle_qr_scan_result(event: { handle_search_trigger(); })} autocomplete="off" - class="search_form preset-tonal-success flex w-full max-w-7xl flex-row flex-wrap items-center justify-center gap-1 rounded-lg px-2 py-2 shadow-sm md:px-12"> + class="search_form bg-primary-50-950 border-primary-100-900 flex w-full max-w-7xl flex-col sm:flex-row flex-wrap items-center justify-center gap-1 rounded-lg px-2 py-2 shadow-md md:px-12">
    + class="flex grow flex-col md:flex-row flex-wrap items-center justify-center gap-1"> {#if $ae_loc.trusted_access} + + { if (e.key === 'Enter') { handle_search_trigger(); @@ -161,7 +163,10 @@ function handle_qr_scan_result(event: {