Skip to content

Commit

Permalink
Merge pull request #234 from meetnearme/develop
Browse files Browse the repository at this point in the history
[release] visual fixes for scrolling attendee table + header position
  • Loading branch information
brianfeister authored Dec 15, 2024
2 parents 3f3698f + fdb5e05 commit 485d4e2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions functions/gateway/templates/pages/event_attendees.templ
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ templ EventAttendeesPage(pageObj helpers.SitePage, event types.Event, isEditor b
<a class="btn btn-sm" href={ templ.URL(strings.Replace(helpers.SitePages["edit-event"].Slug, "{"+helpers.EVENT_ID_KEY+"}", event.Id, 1)) }>Edit Event</a>
</header>
<h2 class="card-title sticky sticky-under-top-nav subheader bg-base-100 z-40 py-2">Purchases</h2>
<div id="tickets-sales" class="card border-2 border-base-300 bg-base-200 p-10 rounded-box">
<div class="card">
<div id="tickets-sales" class="card border-2 border-base-300 bg-base-200 p-10 rounded-box overflow-scroll">
<div>
<template x-if="!hasPurchasesResults && hasPurchasable">
<div class="flex w-full flex-col gap-4">
<div class="skeleton h-4 w-full"></div>
Expand All @@ -45,7 +45,7 @@ templ EventAttendeesPage(pageObj helpers.SitePage, event types.Event, isEditor b
<template x-if="purchasesNextCursor">
<a class="btn btn-sm float-end" :href=" window.location.pathname + '?purch_start_key=' + purchasesNextCursor">Show Next &rarr;</a>
</template>
<table class="table top-align table-pin-rows table-pin-cols table-zebra">
<table class="table top-align bg-base-100 table-pin-rows table-pin-cols table-zebra">
<thead>
<tr>
<th>Buyer</th>
Expand Down Expand Up @@ -121,8 +121,8 @@ templ EventAttendeesPage(pageObj helpers.SitePage, event types.Event, isEditor b
</div>
</div>
<h2 class="card-title sticky sticky-under-top-nav subheader bg-base-100 z-40 py-2 mt-4">Registrations</h2>
<div id="tickets-sales" class="card border-2 border-base-300 bg-base-200 p-10 rounded-box">
<div class="card">
<div id="tickets-registrations" class="card border-2 border-base-300 bg-base-200 p-10 rounded-box overflow-scroll">
<div>
<template x-if="!hasRegistrationResults && hasRegistrationFields">
<div class="flex w-full flex-col gap-4">
<div class="skeleton h-4 w-full"></div>
Expand All @@ -135,7 +135,7 @@ templ EventAttendeesPage(pageObj helpers.SitePage, event types.Event, isEditor b
<template x-if="registrationsNextCursor">
<a class="btn btn-sm float-end" :href="getRegistrationNextLink()">Show Next &rarr;</a>
</template>
<table class="table top-align table-pin-rows table-pin-cols table-zebra">
<table class="table top-align bg-base-100 table-pin-rows table-pin-cols table-zebra">
<thead>
<tr>
<th>Buyer</th>
Expand Down
2 changes: 1 addition & 1 deletion functions/gateway/templates/pages/layout.templ
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ templ Layout(sitePage helpers.SitePage, userInfo helpers.UserInfo, pageContent t
<link rel="preconnect" href="https://fonts.googleapis.com"/>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/>
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@400&family=Ubuntu+Mono:ital,wght@0,400;0,700;1,400;1,700&family=Anton&display=swap" rel="stylesheet"/>
// 🚨 WARNING 🚨 This hash (`?h=___fd34d271___`) is generated by the watchTempl.js script, do not change it
// 🚨 WARNING 🚨 This hash (`?h=___59a94be0___`) is generated by the watchTempl.js script, do not change it
// ✅ DO commit it to version control whenever you see it change
<link rel="stylesheet" href={ templ.EscapeString(os.Getenv("STATIC_BASE_URL")+"/assets/styles.css") + "?h=___5c450ab4___" }/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
Expand Down
10 changes: 5 additions & 5 deletions static/assets/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,24 @@ body:has(.bottom-drawer) {
}

.sticky-under-top-nav {
top: 4.5rem;
top: 4rem;
}

.sticky-under-top-nav.subheader {
top: 8.5rem;
top: 8rem;
}

.sticky-under-top-nav + *:first-child {
margin-top: 4.5rem;
margin-top: 4rem;
}

.brand-logo {
width: 3rem;
height: 4.5rem;
height: 4rem;
}

.brand-type {
width: 8.2rem;
width: 7.7rem;
}

.drawer-end .drawer-toggle ~ .drawer-side {
Expand Down

0 comments on commit 485d4e2

Please sign in to comment.