Merge pull request #1434 from basecamp/jz-10-31-25

JZ 10/31/25
This commit is contained in:
Jason Zimdars
2025-10-31 11:30:29 -05:00
committed by GitHub
9 changed files with 12 additions and 11 deletions
+1
View File
@@ -25,6 +25,7 @@
.txt-break { word-break: break-word; }
.txt-uppercase { text-transform: uppercase; }
.txt-capitalize { text-transform: capitalize; }
.txt-capitalize-first-letter::first-letter { text-transform: capitalize; }
.txt-link { color: var(--color-link); text-decoration: underline; }
.font-weight-black { font-weight: 900; }
+1 -1
View File
@@ -3,7 +3,7 @@ class MagicLinkMailer < ApplicationMailer
@magic_link = magic_link
@identity = @magic_link.identity
mail to: @identity.email_address, subject: "Sign in to Fizzy"
mail to: @identity.email_address, subject: "Sign in to BOXCAR"
end
private
+1 -1
View File
@@ -23,7 +23,7 @@ module Filter::Resources
def collection_titles
if collections.none?
Collection.one? ? [ Collection.first.name ] : [ "All boards" ]
Collection.one? ? [ Collection.first.name ] : [ "all boards" ]
else
collections.map(&:name)
end
+1 -1
View File
@@ -5,7 +5,7 @@
<% content_for :header do %>
<h1 class="header__title divider divider--fade full-width">
<span class="overflow-ellipsis"><%= @user_filtering.selected_collections_label %></span>
<span class="overflow-ellipsis txt-capitalize-first-letter"><%= @user_filtering.selected_collections_label %></span>
</h1>
<div class="header__actions header__actions--end">
@@ -1,5 +1,5 @@
<h1 class="title">Confirm your email address change</h1>
<p class="subtitle">Hit the button below to use this email address in Fizzy.</p>
<p class="subtitle">Hit the button below to use this email address in BOXCAR.</p>
<%= link_to "Yes use use this email address", email_address_confirmation_url(membership_id: @membership.id, email_address_token: @token), class: "btn" %>
@@ -1,7 +1,7 @@
Confirm your email address change
<%= "=" * 80 %>
Hit the link below to use this email address in Fizzy:
Hit the link below to use this email address in BOXCAR:
<%= email_address_confirmation_url(membership_id: @membership.id, email_address_token: @token) %>
@@ -1,9 +1,9 @@
<h1 class="title">Sign in to Fizzy</h1>
<p class="subtitle">Hit the button below to sign in to Fizzy on this device</p>
<h1 class="title">Sign in to BOXCAR</h1>
<p class="subtitle">Hit the button below to sign in to BOXCAR on this device</p>
<%= link_to "Sign in to Fizzy", session_magic_link_url(code: @magic_link.code), class: "btn" %>
<%= link_to "Sign in to BOXCAR", session_magic_link_url(code: @magic_link.code), class: "btn" %>
<p class="margin-block-start-double">If you're signing in on another device, enter this special code:
<p class="margin-block-start-double">If youre signing in on another device, enter this special code:
<br><strong class="txt-large"><%= @magic_link.code %></strong>
</p>
@@ -1,4 +1,4 @@
Sign in to Fizzy
Sign in to BOXCAR
<%= "=" * 80 %>
Open this link in your browser to login on this device:
+1 -1
View File
@@ -10,7 +10,7 @@ class MagicLinkMailerTest < ActionMailer::TestCase
end
assert_equal [ "kevin@37signals.com" ], email.to
assert_equal "Sign in to Fizzy", email.subject
assert_equal "Sign in to BOXCAR", email.subject
assert_match magic_link.code, email.body.encoded
end
end