Skip to content

JM: Pad unpadded back-nav eyebrows to match the standard eyebrow #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maebeale wants to merge 1 commit into
base: main
Choose a base branch
from
+128 −128
Open

JM: Pad unpadded back-nav eyebrows to match the standard eyebrow #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/admin/ahoy_activities/charts.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="<%= DomainTheme.bg_class_for(:admin_only) %> rounded-xl border border-gray-200 p-6 shadow">
<div class="mb-2 flex flex-wrap items-center gap-y-2">
<% if allowed_to?(:index?, with: Admin::HomePolicy) %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class}" do %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fas fa-arrow-left"></i>
<span>Admin</span>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/ahoy_activities/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<%# Scoped to a person (from their edit page's History card, or the filter) —
return to that person, not the generic Admin default. %>
<% if @person %>
<%= link_to edit_person_path(@person), class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class}" do %>
<%= link_to edit_person_path(@person), class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fas fa-arrow-left"></i>
<span><%= truncate(@person.name, length: 30) %></span>
<% end %>
<% elsif allowed_to?(:index?, with: Admin::HomePolicy) %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class}" do %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fas fa-arrow-left"></i>
<span>Admin</span>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/ahoy_activities/visits.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<div class="flex flex-wrap items-center gap-y-2 mb-2">
<% if allowed_to?(:index?, with: Admin::HomePolicy) %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class}" do %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fas fa-arrow-left"></i>
<span>Admin</span>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/analytics/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="<%= DomainTheme.bg_class_for(:admin_only) %> rounded-xl border border-gray-200 p-6 shadow">
<div class="mb-2 flex flex-wrap items-center gap-y-2">
<% if allowed_to?(:index?, with: Admin::HomePolicy) %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class}" do %>
<%= link_to admin_path, class: "inline-flex items-center gap-1 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fas fa-arrow-left"></i>
<span>Admin</span>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/affiliations/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<div class="mx-auto max-w-3xl <%= DomainTheme.bg_class_for(:organizations) %> border border-gray-200 rounded-xl shadow p-4 sm:p-6">
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<% if back_path %>
<%= link_to back_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to back_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i>
<%= params[:return_to] == "person" ? @affiliation.person&.full_name : @affiliation.organization&.name %>
<% end %>
<% else %>
<span></span>
<% end %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>

<h1 class="text-2xl font-semibold text-gray-900 tracking-tight mb-1">Edit affiliation</h1>
Expand Down
18 changes: 9 additions & 9 deletions app/views/allocations/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<% if @allocatable.is_a?(EventRegistration) && params[:return_to] == "bulk_payments" %>
<%# Re-expand the originating submission's row and scroll to it on return. %>
<%= link_to bulk_payments_return_path(@allocatable.event), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to bulk_payments_return_path(@allocatable.event), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Bulk payments
<% end %>
<% elsif @allocatable.is_a?(EventRegistration) && params[:return_to] == "registrants" %>
<%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registrants
<% end %>
<% elsif @allocatable.is_a?(EventRegistration) && params[:return_to] == "onboarding" %>
<%= link_to onboarding_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to onboarding_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Onboarding
<% end %>
<% elsif @allocatable.is_a?(EventRegistration) %>
<%= link_to edit_event_registration_path(@allocatable), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to edit_event_registration_path(@allocatable), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registration
<% end %>
<% elsif @allocatable.is_a?(ContinuingEducationRegistration) %>
<%= link_to edit_continuing_education_registration_path(@allocatable), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to edit_continuing_education_registration_path(@allocatable), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> CE registration
<% end %>
<% elsif @allocatable.respond_to?(:event) %>
<%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registrants
<% end %>
<% else %>
<span></span>
<% end %>
<div class="flex items-center gap-3">
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "All allocations", allocations_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<%= link_to "All allocations", allocations_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>
</div>

Expand Down Expand Up @@ -124,7 +124,7 @@
registrants index (left-aligned title, filter form, results table). ---- %>
<div class="max-w-7xl mx-auto <%= DomainTheme.bg_class_for(:payments) %> border border-gray-200 rounded-xl shadow p-6">
<div class="flex flex-wrap items-center justify-between gap-2 sm:gap-4 mb-6">
<%= link_to "← Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>

<div class="flex flex-wrap items-center justify-between gap-4 mb-6">
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% content_for(:page_bg_class, "admin-only bg-white") %>
<div class="mb-3">
<%= link_to admin_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to admin_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Admin home
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/continuing_education_registrations/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="mx-auto max-w-3xl <%= DomainTheme.bg_class_for(:continuing_education) %> rounded-xl border border-gray-200 p-4 shadow sm:p-6">
<%# Top bar: back link + secondary links, matching the scholarship edit page %>
<div class="mb-6 flex flex-wrap items-center justify-between gap-2">
<%= link_to ce_registration_return_path(registration), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to ce_registration_return_path(registration), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> <%= ce_registration_return_label %>
<% end %>
<div class="flex items-center gap-3">
Expand All @@ -18,7 +18,7 @@
icon: "fa-solid fa-id-card text-2xs",
href: registration_ce_path(registration.slug, return_to: "ce_registration"),
target: "_blank", rel: "noopener" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions app/views/continuing_education_registrations/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="max-w-7xl mx-auto <%= DomainTheme.bg_class_for(:continuing_education) %> border border-gray-200 rounded-xl shadow p-6">
<%# Top-left menu: jump to the cross-event CE sign-ins. %>
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<%= link_to signins_events_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to signins_events_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-clipboard-check text-xs"></i> CE sign-ins
<% end %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>

<div class="flex items-center gap-3 mb-6">
Expand Down
4 changes: 2 additions & 2 deletions app/views/continuing_education_registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<div class="mx-auto max-w-3xl <%= DomainTheme.bg_class_for(:continuing_education) %> rounded-xl border border-gray-200 p-4 shadow sm:p-6">
<%# Top bar: back link + Home, matching the CE edit page. %>
<div class="mb-6 flex flex-wrap items-center justify-between gap-2">
<%= link_to ce_registration_return_path(registration), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to ce_registration_return_path(registration), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> <%= ce_registration_return_label %>
<% end %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>

<%= render "shared/event_page_header",
Expand Down
6 changes: 3 additions & 3 deletions app/views/continuing_education_registrations/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<div class="mx-auto max-w-3xl <%= DomainTheme.bg_class_for(:continuing_education) %> border border-gray-200 rounded-xl shadow p-4 sm:p-6">
<%# Top bar: back to the CE registrations index + Edit / Home. %>
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<%= link_to continuing_education_registrations_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to continuing_education_registrations_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> CE registrations
<% end %>
<div class="flex items-center gap-3">
<%= link_to "Edit", edit_continuing_education_registration_path(@ce_registration, return_to: "ce_index"), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Edit", edit_continuing_education_registration_path(@ce_registration, return_to: "ce_index"), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>
</div>

Expand Down
24 changes: 12 additions & 12 deletions app/views/event_registrations/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,51 @@
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<% if params[:return_to] == "bulk_payments" %>
<%# Re-expand the originating submission's row and scroll to it on return. %>
<%= link_to bulk_payments_return_path(@event_registration.event), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to bulk_payments_return_path(@event_registration.event), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Bulk payments
<% end %>
<% elsif params[:return_to] == "preview_reminder" %>
<%= link_to preview_reminder_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to preview_reminder_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Send reminders
<% end %>
<% elsif params[:return_to] == "onboarding" %>
<%= link_to onboarding_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to onboarding_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Onboarding
<% end %>
<% elsif params[:return_to] == "attendees" %>
<%= link_to attendees_events_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to attendees_events_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Attendees
<% end %>
<% elsif params[:return_to] == "roster" %>
<%= link_to roster_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to roster_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Roster
<% end %>
<%# Two ways in from the recipients page: a recipient's name (back to their own
card) and the feature-a-shout-out flow (back to the shout-outs section). %>
<% elsif params[:return_to] == "recipient_card" %>
<%= link_to recipients_event_card_path(@event_registration.event, @event_registration.slug), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to recipients_event_card_path(@event_registration.event, @event_registration.slug), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Scholarship recipients
<% end %>
<% elsif params[:return_to] == "recipients" %>
<%= link_to recipients_event_path(@event_registration.event, anchor: "shout-outs"), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to recipients_event_path(@event_registration.event, anchor: "shout-outs"), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Recipients
<% end %>
<% elsif params[:return_to] == "index" %>
<%= link_to event_registrations_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to event_registrations_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registrations
<% end %>
<% elsif params[:return_to] == "attendance" %>
<%= link_to attendance_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to attendance_event_path(@event_registration.event), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Sign-ins
<% end %>
<% else %>
<%= link_to registrants_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to registrants_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registrants
<% end %>
<% end %>
<div class="flex items-center gap-3">
<%= link_to "View", event_registration_path(@event_registration), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "View", event_registration_path(@event_registration), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions app/views/event_registrations/link_organization.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<div class="max-w-2xl mx-auto py-8 px-4">
<div class="mb-4">
<% if params[:return_to] == "onboarding" %>
<%= link_to "← Back to onboarding", onboarding_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Back to onboarding", onboarding_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% else %>
<%= link_to "← Back to registrants", registrants_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Back to registrants", registrants_event_row_path(@event_registration.event, @event_registration.id), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% end %>
</div>
<div class="bg-white rounded-xl shadow-lg border border-gray-200 p-6">
Expand Down
4 changes: 2 additions & 2 deletions app/views/event_registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="mx-auto max-w-3xl <%= DomainTheme.bg_class_for(:event_registrations) %> border border-gray-200 rounded-xl shadow p-4 sm:p-6">
<%# Top bar: back link, matching the event pages %>
<div class="flex flex-wrap items-center justify-between gap-2 mb-6">
<%= link_to event_registrations_path, class: "text-sm #{eyebrow_link_class}" do %>
<%= link_to event_registrations_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i> Registrations
<% end %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "Home", root_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
</div>

<%# Title block %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/event_registrations/transfer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
roster_path = registrants_event_path(source.event)
%>
<div class="mb-4">
<%= link_to roster_path, class: "inline-flex items-center gap-1.5 text-sm #{eyebrow_link_class}" do %>
<%= link_to roster_path, class: "inline-flex items-center gap-1.5 text-sm #{eyebrow_link_class} px-2 py-1" do %>
<i class="fa-solid fa-arrow-left text-xs"></i>
<%= source.event.title %> registrants
<% end %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/events/attendance.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<div class="mb-6 flex flex-wrap items-center justify-between gap-2 sm:gap-4">
<% case params[:return_to] %>
<% when "dashboard" %>
<%= link_to "← Dashboard", dashboard_event_path(@event), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Dashboard", dashboard_event_path(@event), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% when "registrants" %>
<%= link_to "← Registrants", registrants_event_path(@event), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Registrants", registrants_event_path(@event), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% when "signins" %>
<%= link_to "← All sign-ins", signins_events_path(report_to_hub_params.except(:period)), class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← All sign-ins", signins_events_path(report_to_hub_params.except(:period)), class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% else %>
<%= link_to "← Events participation", participation_events_path, class: "text-sm #{eyebrow_link_class}" %>
<%= link_to "← Events participation", participation_events_path, class: "text-sm #{eyebrow_link_class} px-2 py-1" %>
<% end %>
<%= render "events/subnav", event: @event, current: :attendance %>
</div>
Expand Down
Loading