From 4f6d8f0e7d46217442be06ccec081f6dccbb99bf Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 16:22:41 -0500
Subject: [PATCH 01/19] Don't count closed cards because they're not displayed

---
 app/models/tag.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 0247a0fa5..9c6e6c260 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -15,6 +15,6 @@ class Tag < ApplicationRecord
   end
 
   def cards_count
-    cards.count
+    cards.open.count
   end
 end

From 391675e615c313a56a99744070d880214d49fc2d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 16:49:12 -0500
Subject: [PATCH 02/19] Rename: Collection -> Board

---
 app/models/filter/resources.rb                   | 2 +-
 app/views/collections/edit.html.erb              | 4 ++--
 app/views/collections/edit/_delete.html.erb      | 2 +-
 app/views/collections/edit/_publication.html.erb | 2 +-
 app/views/collections/edit/_users.html.erb       | 2 +-
 app/views/collections/new.html.erb               | 4 ++--
 app/views/filters/menu/_collections.html.erb     | 2 +-
 app/views/filters/menu/_hotkeys.html.erb         | 2 +-
 app/views/filters/settings/_collections.html.erb | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/models/filter/resources.rb b/app/models/filter/resources.rb
index 9110d3727..669b214f4 100644
--- a/app/models/filter/resources.rb
+++ b/app/models/filter/resources.rb
@@ -23,7 +23,7 @@ module Filter::Resources
 
   def collection_titles
     if collections.none?
-      Collection.one? ? [ Collection.first.name ] : [ "All collections" ]
+      Collection.one? ? [ Collection.first.name ] : [ "All boards" ]
     else
       collections.map(&:name)
     end
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index df0d6dc79..17fb658ff 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -1,4 +1,4 @@
-<% @page_title = "Collection Settings" %>
+<% @page_title = "Board Settings" %>
 
 <% content_for :header do %>
   <%= render "filters/menu" %>
@@ -18,7 +18,7 @@
   <div class="settings__panel settings__panel--users panel shadow center">
     <header>
       <h2 class="divider txt-large">Name and Access</h2>
-      <div>Choose who can access this Collection</div>
+      <div>Choose who can access this Board</div>
     </header>
 
     <%= form_with model: @collection, class: "display-contents", data: {
diff --git a/app/views/collections/edit/_delete.html.erb b/app/views/collections/edit/_delete.html.erb
index a3d6eab5a..29de41ab9 100644
--- a/app/views/collections/edit/_delete.html.erb
+++ b/app/views/collections/edit/_delete.html.erb
@@ -2,7 +2,7 @@
   <%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %>
     <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %>
       <%= icon_tag "trash" %>
-      <span>Delete this Collection</span>
+      <span>Delete this Board</span>
     <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/collections/edit/_publication.html.erb b/app/views/collections/edit/_publication.html.erb
index ae350bddb..cedd85b56 100644
--- a/app/views/collections/edit/_publication.html.erb
+++ b/app/views/collections/edit/_publication.html.erb
@@ -1,7 +1,7 @@
 <%= turbo_frame_tag @collection, :publication do %>
   <header>
     <h2 class="divider txt-large">Public link</h2>
-    <div>Turn on the Public link to share this collection with anyone in the world. They won’t need to log in and they won’t be able to see anything else in Fizzy.</div>
+    <div>Turn on the Public link to share this Board with anyone in the world. They won’t need to log in and they won’t be able to see anything else in Fizzy.</div>
   </header>
 
   <% if collection.published? %>
diff --git a/app/views/collections/edit/_users.html.erb b/app/views/collections/edit/_users.html.erb
index 6e12f5016..2c9dabcbc 100644
--- a/app/views/collections/edit/_users.html.erb
+++ b/app/views/collections/edit/_users.html.erb
@@ -14,7 +14,7 @@
     <label for="collection_all_access" class="switch">
       <%= form.check_box :all_access, class: "switch__input", checked: collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
       <span class="switch__btn round"></span>
-      <span class="for-screen-reader">Give everyone access to this project</span>
+      <span class="for-screen-reader">Give everyone access to this Board</span>
     </label>
   </li>
 
diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb
index ba9f1151f..5c8339f01 100644
--- a/app/views/collections/new.html.erb
+++ b/app/views/collections/new.html.erb
@@ -1,4 +1,4 @@
-<% @page_title = "Create a new collection" %>
+<% @page_title = "Create a new Board" %>
 
 <% content_for :header do %>
   <%= render "filters/menu" %>
@@ -6,7 +6,7 @@
 
 <div class="panel shadow center" style="--panel-size: 55ch; view-transition-name: new-collection">
   <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
-    <h2 class="txt-x-large">Create a new collection</h2>
+    <h2 class="txt-x-large"><%= @page_title %></h2>
     <label class="flex align-center gap">
       <%= form.text_field :name, required: true, class: "input full-width", autofocus: true, autocomplete: "off",placeholder: "Give it a name…", data: { action: "keydown.esc@document->form#cancel" } %>
     </label>
diff --git a/app/views/filters/menu/_collections.html.erb b/app/views/filters/menu/_collections.html.erb
index 590fb9173..808dbc866 100644
--- a/app/views/filters/menu/_collections.html.erb
+++ b/app/views/filters/menu/_collections.html.erb
@@ -1,6 +1,6 @@
 <% # Using method: :get inside Turbo frame triggers some special Turbo handling where the script_name is lost %>
 <% if user_filtering.collections.any? %>
-  <%= collapsible_nav_section "Collections" do %>
+  <%= collapsible_nav_section "Boards" do %>
     <%= render partial: "filters/menu/collections/collection", collection: user_filtering.collections, as: :collection %>
   <% end %>
 <% end %>
diff --git a/app/views/filters/menu/_hotkeys.html.erb b/app/views/filters/menu/_hotkeys.html.erb
index 5a1703a23..76cc8b096 100644
--- a/app/views/filters/menu/_hotkeys.html.erb
+++ b/app/views/filters/menu/_hotkeys.html.erb
@@ -2,7 +2,7 @@
   <%= filter_hotkey_link "Home", root_path, 1, "home" %>
   <%= filter_hotkey_link "Assigned to me", cards_path(assignee_ids: [Current.user.id]), 2, "clipboard" %>
   <%= filter_hotkey_link "Added by me", cards_path(creator_ids: [Current.user.id]), 3, "person-add" %>
-  <%= filter_hotkey_link "New Collection", new_collection_path, 4, "collection-add" %>
+  <%= filter_hotkey_link "New Board", new_collection_path, 4, "collection-add" %>
   <%= filter_hotkey_link "Notifications", notifications_path, 5, "bell" %>
   <%= filter_hotkey_link "Account #{tag.span("Settings", class: "visually-hidden")}", account_settings_path, 6, "settings" %>
 </div>
diff --git a/app/views/filters/settings/_collections.html.erb b/app/views/filters/settings/_collections.html.erb
index 80a0811e2..334b0db29 100644
--- a/app/views/filters/settings/_collections.html.erb
+++ b/app/views/filters/settings/_collections.html.erb
@@ -5,7 +5,7 @@
         controller: "dialog multi-selection-combobox",
         action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
         filter_show: user_filtering.show_collections?,
-        multi_selection_combobox_no_selection_label_value: "Collection…",
+        multi_selection_combobox_no_selection_label_value: "Board…",
         multi_selection_combobox_label_prefix_value: "" } do %>
     <button type="button" class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#toggle:stop">
       <span class="overflow-ellipsis" data-multi-selection-combobox-target="label">
@@ -16,8 +16,8 @@
       <%= hidden_field_tag "collection_ids[]", nil, data: { filter_settings_target: "field" } %>
     </template>
 
-    <%= filter_dialog "Collection…" do %>
-      <strong class="popup__title">Collection…</strong>
+    <%= filter_dialog "Board…" do %>
+      <strong class="popup__title">Board…</strong>
 
       <% if user_filtering.collections.many? %>
         <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,

From a720a74d8e0f04fb20cb67e7fc485d4b209a9894 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 16:50:01 -0500
Subject: [PATCH 03/19] Capitalize

---
 app/models/filter/resources.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/filter/resources.rb b/app/models/filter/resources.rb
index 669b214f4..d166737fe 100644
--- a/app/models/filter/resources.rb
+++ b/app/models/filter/resources.rb
@@ -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

From 66733f77ec296d6eddcf5151c498b49e3b9fea0e Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 18:19:20 -0500
Subject: [PATCH 04/19] Adjust copy for single collection and filtered activity
 cases

---
 app/views/events/index.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 4868a5295..5d1443b13 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -8,8 +8,12 @@
   <%= render "events/index/add_card_button", user_filtering: @user_filtering %>
 
   <h1 class="header__title">
-    <span>Activity in</span>
-    <%= render "events/index/filter", user_filtering: @user_filtering %>
+    <% if @user_filtering.collections.one? %>
+      Latest Activity
+    <% else %>
+      <span>Activity <%= @user_filtering.filter.collections.any? ? "in" : "across" %></span>
+      <%= render "events/index/filter", user_filtering: @user_filtering %>
+    <% end %>
   </h1>
 <% end %>
 

From 6add4e257ecf5c0fc30a78af2972f687490312a3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 18:24:06 -0500
Subject: [PATCH 05/19] Commit the text filter when reaching for the other
 controls

That you need to commit the filter to get a pill, and thus save a
filter, isn't obvious. This helps.
---
 app/views/filters/settings/_terms.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/filters/settings/_terms.html.erb b/app/views/filters/settings/_terms.html.erb
index dbc005b02..237eea809 100644
--- a/app/views/filters/settings/_terms.html.erb
+++ b/app/views/filters/settings/_terms.html.erb
@@ -3,7 +3,7 @@
             "1p-ignore": "true",
             controller: "hotkey",
             filter_settings_target: "field",
-            action: "keydown.f@document->hotkey#focus input->filter-settings#resetIfNoFiltering input->form#debouncedSubmit keydown.enter->form#submitToTopTarget" } %>
+            action: "keydown.f@document->hotkey#focus input->filter-settings#resetIfNoFiltering input->form#debouncedSubmit keydown.enter->form#submitToTopTarget blur->form#submitToTopTarget" } %>
 
 <% if filter.terms.present? %>
   <% filter.terms.each do |term| %>

From 1372a6bb298332681613fc9c98906c4c43576e4c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 18:30:36 -0500
Subject: [PATCH 06/19] Reign in the wide notification cards

---
 app/assets/stylesheets/notifications.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css
index c5d3f4c50..878eb25c5 100644
--- a/app/assets/stylesheets/notifications.css
+++ b/app/assets/stylesheets/notifications.css
@@ -3,12 +3,14 @@
   /* ------------------------------------------------------------------------ */
 
   .notifications-list {
+    --panel-size: 45ch;
+
     .tray__item {
       position: relative;
 
       &[aria-selected] {
         outline: 0;
-        
+
         .card {
           border-radius: 0.25ch;
           outline: var(--focus-ring-size) solid var(--focus-ring-color);
@@ -56,8 +58,8 @@
       &:before {
         opacity: 0;
       }
-      
-      .icon { 
+
+      .icon {
         opacity: 1;
       }
     }

From d5d65fbd6368c46237a217d0a5b6392be50e30f3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 18:37:07 -0500
Subject: [PATCH 07/19] Bring back join code for now

Can remove once the new system is ready:
https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337
---
 app/views/account/settings/_users.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/account/settings/_users.html.erb b/app/views/account/settings/_users.html.erb
index 61449f09a..15938f7e7 100644
--- a/app/views/account/settings/_users.html.erb
+++ b/app/views/account/settings/_users.html.erb
@@ -4,8 +4,9 @@
   navigable_list_focus_on_selection_value: true,
   navigable_list_actionable_items_value: true
 } do %>
+
   <h2 class="divider txt-large">People on the account</h2>
-  <%#= render "account/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
+  <%= render "account/invite" %>
 
   <div class="settings__user-filter">
     <input placeholder="Filter…" class="input input--transparent full-width txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-filter-target="input" data-action="input->filter#filter">

From 01b22ace3ea15c5d51e71410d5ca131db48f71c3 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 16 Oct 2025 15:52:43 -0500
Subject: [PATCH 08/19] Smoother expand transitions for columns

---
 app/assets/stylesheets/card-columns.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index a051261af..e78a6b7c0 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -103,9 +103,8 @@
   .cards__list {
     display: grid;
     gap: var(--cards-gap);
-    margin-block-start: -1ch;
     margin-inline: -1ch;
-    padding: 1ch;
+    padding-inline: 1ch;
     overflow: hidden;
 
     .card {

From 4fdf7e63cf9ddf41978b52d0ba9dd6edafeab0db Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:14:59 -0500
Subject: [PATCH 09/19] Fix merge regression

---
 app/assets/stylesheets/card-columns.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index e78a6b7c0..a051261af 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -103,8 +103,9 @@
   .cards__list {
     display: grid;
     gap: var(--cards-gap);
+    margin-block-start: -1ch;
     margin-inline: -1ch;
-    padding-inline: 1ch;
+    padding: 1ch;
     overflow: hidden;
 
     .card {

From 2b0e6f8b0a4b8c6ddb54bcacec239d54b804ae5a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:18:44 -0500
Subject: [PATCH 10/19] Fix regression in grid layout

---
 app/assets/stylesheets/card-columns.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index a051261af..a49f6a3f7 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -123,8 +123,10 @@
     --card-grid-columns: 1;
 
     container-type: inline-size;
+    display: flex;
     flex-direction: row;
     flex-wrap: wrap;
+    gap: var(--cards-gap);
     justify-content: center;
     margin-inline: auto;
     max-inline-size: var(--main-width);

From 20e378c2cbe16e47a03c2a4c9b6bbacb03f24db6 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:20:07 -0500
Subject: [PATCH 11/19] Restore missing space between the tools card and cards
 in the stream

---
 app/assets/stylesheets/card-columns.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index a49f6a3f7..f9d39118d 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -591,6 +591,7 @@
     --card-padding-block: var(--block-space);
 
     border: 1px solid var(--border-color);
+    margin-block-end: var(--cards-gap);
     text-align: center;
 
     &:has(dialog[open]) {

From a2bba83963c21839a5c0af7b23ee64b4f3b417f0 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:25:23 -0500
Subject: [PATCH 12/19] Only display the stamp on the card perma

---
 app/assets/stylesheets/cards.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index add8f892f..38213e31e 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -320,6 +320,10 @@
     position: absolute;
     rotate: 5deg;
     transform-origin: top right;
+
+    .cards &  {
+      display: none;
+    }
   }
 
   .card:has(.card__closed),

From 30b28fa31275795c008f291d96620e402e7ad6a7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:28:18 -0500
Subject: [PATCH 13/19] Bust out of the list and allow the grid to lay out
 these items

---
 app/assets/stylesheets/card-columns.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index f9d39118d..ed0a7134d 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -111,6 +111,10 @@
     .card {
       inline-size: calc(var(--column-width-expanded) - var(--column-padding-expanded) * 2);
     }
+
+    .cards--grid & {
+      display: contents;
+    }
   }
 
   .cards__new-column {

From f31a2693f4c6022cddf194482dbb7f9f102ba90b Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:38:09 -0500
Subject: [PATCH 14/19] Try a different unit type in the hopes that Windows
 handles this more accurately

---
 app/assets/stylesheets/filters.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css
index 7e609bf29..baa876e96 100644
--- a/app/assets/stylesheets/filters.css
+++ b/app/assets/stylesheets/filters.css
@@ -107,7 +107,7 @@
     --input-background: var(--color-canvas);
     --input-border-radius: 5em;
     --input-padding: 0.5em 1.3em;
-    --input-width: 24ch;
+    --input-width: 16em;
     --collapsed-filter-space: calc(var(--btn-size) + var(--inline-space-half) + 0.25em);
 
     inline-size: var(--input-width);

From 4fc61a50006c543902fa75db4261eea6e97291e4 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:46:16 -0500
Subject: [PATCH 15/19] Tighter linking

---
 app/views/webhooks/event.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/webhooks/event.html.erb b/app/views/webhooks/event.html.erb
index 872bf49b9..dc93c23ab 100644
--- a/app/views/webhooks/event.html.erb
+++ b/app/views/webhooks/event.html.erb
@@ -1,4 +1,4 @@
 <%= event_action_sentence(@event) %>
 <% if @event.eventable %>
-— <%= link_to "Show more", polymorphic_url(@event.eventable) %>
+— <%= link_to "↗︎", polymorphic_url(@event.eventable) %>
 <% end %>

From 85efb02558be04abe75f26bd6077ef1e440700dc Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 19:52:11 -0500
Subject: [PATCH 16/19] Add quotes to event action object to delinate proper
 names in ambiguous situations

Sometimes coloring them isn't clear enough (especially on closed cards
and in web hooks payloads)
---
 app/helpers/events_helper.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 031236b1c..7e0ae61cf 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -61,7 +61,7 @@ module EventsHelper
   end
 
   def comment_event_action_sentence(event)
-    "#{h event_creator_name(event) } commented on <span style='color: var(--card-color)'>#{h event.eventable.card.title }</span>".html_safe
+    "#{h event_creator_name(event) } commented on <span style='color: var(--card-color)'>\"#{h event.eventable.card.title }\"</span>".html_safe
   end
 
   def event_creator_name(event)
@@ -75,28 +75,28 @@ module EventsHelper
     case event.action
     when "card_assigned"
       if event.assignees.include?(Current.user)
-        "#{h event_creator_name(event) } will handle <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+        "#{h event_creator_name(event) } will handle <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
       else
-        "#{h event_creator_name(event) } assigned #{h event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+        "#{h event_creator_name(event) } assigned #{h event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
       end
     when "card_unassigned"
-      "#{h event_creator_name(event) } unassigned #{ h(event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence) } from <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event) } unassigned #{ h(event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence) } from <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_published"
-      "#{h event_creator_name(event) } added <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event) } added <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_closed"
-      "#{h event_creator_name(event) } marked <span style='color: var(--card-color)'>#{h title }</span> as done".html_safe
+      "#{h event_creator_name(event) } marked <span style='color: var(--card-color)'>\"#{h title }\"</span> as done".html_safe
     when "card_reopened"
-      "#{h event_creator_name(event) } reopened <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event) } reopened <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_due_date_added"
-      "#{h event_creator_name(event)} set the date to #{h event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event)} set the date to #{h event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_due_date_changed"
-      "#{h event_creator_name(event)} changed the date to #{h event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event)} changed the date to #{h event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_due_date_removed"
-      "#{h event_creator_name(event)} removed the date on <span style='color: var(--card-color)'>#{h title }</span>".html_safe
+      "#{h event_creator_name(event)} removed the date on <span style='color: var(--card-color)'>\"#{h title }\"</span>".html_safe
     when "card_title_changed"
-      "#{h event_creator_name(event)} renamed <span style='color: var(--card-color)'>#{h title }</span> (was: '#{h event.particulars.dig('particulars', 'old_title')})'".html_safe
+      "#{h event_creator_name(event)} renamed <span style='color: var(--card-color)'>\"#{h title }\"</span> (was: '#{h event.particulars.dig('particulars', 'old_title')})'".html_safe
     when "card_collection_changed"
-      "#{h event_creator_name(event)} moved <span style='color: var(--card-color)'>#{h title }</span> to '#{h event.particulars.dig('particulars', 'new_collection')}'".html_safe
+      "#{h event_creator_name(event)} moved <span style='color: var(--card-color)'>\"#{h title }\"</span> to '#{h event.particulars.dig('particulars', 'new_collection')}'".html_safe
     end
   end
 

From 2f9fb2e20b26cd4f9f5b38b1bb2122d3b092ab52 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 20:02:57 -0500
Subject: [PATCH 17/19] Bring back a dedicated button for adding tags

Fixes and issue in which you couldn't add a new tag if there were any
matches so you couldn't created a tag named "blue" if there was already
one named "blueberry"
`
---
 app/views/cards/taggings/new.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index 940ebe8a1..a016470aa 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -7,12 +7,19 @@
   >
     <strong class="popup__title">Tag this…</strong>
 
-    <%= form_with url: card_taggings_path(@card), class: "flex flex-column gap-half full-width margin-block-half" do |form| %>
+    <%= form_with url: card_taggings_path(@card), id: dom_id(@card, :tags_form), class: "flex flex-column gap-half full-width margin-block-half" do |form| %>
       <%= form.text_field :tag_title, placeholder: @tags.any? ? "Add a new tag or filter…" : "Name this tag…", class: "input txt-small full-width",
             autocomplete: "off", data: { filter_target: "input", action: "input->filter#filter" } %>
     <% end %>
 
     <ul class="popup__list" data-filter-target="list">
+      <li class="popup__item" data-navigable-list-target="item">
+        <%= button_tag "Create a new tag", type: "submit", form: dom_id(@card, :tags_form), class: "btn popup__btn" do %>
+          <%= icon_tag "add" %>
+          <span>Create tag</span>
+        <% end %>
+      </li>
+
       <% @tags.each do |tag| %>
         <li class="popup__item" data-filter-target="item" data-navigable-list-target="item">
           <%= button_to card_taggings_path(@card, params: { tag_title: tag.title }), method: :post,

From 0a4e5dafcb65f37da11ed07a49eb962630c90e10 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 20:12:55 -0500
Subject: [PATCH 18/19] Anchor to comments

---
 app/models/notification_pusher.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/notification_pusher.rb b/app/models/notification_pusher.rb
index 000a80fff..65449b0a8 100644
--- a/app/models/notification_pusher.rb
+++ b/app/models/notification_pusher.rb
@@ -47,7 +47,8 @@ class NotificationPusher
       when "comment_created"
         base_payload.merge(
           title: "RE: #{base_payload[:title]}",
-          body: comment_notification_body(event)
+          body: comment_notification_body(event),
+          path: card_path_with_comment_anchor(event.eventable)
         )
       when "card_assigned"
         base_payload.merge(
@@ -111,4 +112,8 @@ class NotificationPusher
     def card_path(card)
       "#{Account.sole.slug}#{Rails.application.routes.url_helpers.card_path(card)}"
     end
+
+    def card_path_with_comment_anchor(comment)
+      "#{Account.sole.slug}#{Rails.application.routes.url_helpers.card_path(comment.card, anchor: ActionView::RecordIdentifier.dom_id(comment))}"
+    end
 end

From f7c5996becb88a2e0cadb64b7d4bed6238525fb9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 16 Oct 2025 20:20:56 -0500
Subject: [PATCH 19/19] Update test

---
 test/controllers/events_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index c89c06540..528b2da48 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -12,7 +12,7 @@ class EventsControllerTest < ActionDispatch::IntegrationTest
     get events_path
 
     assert_select "div.events__time-block[style='grid-area: 17/2']" do
-      assert_select "strong", text: "David assigned JZ to Layout is broken"
+      assert_select "strong", text: "David assigned JZ to \"Layout is broken\""
     end
   end
 
@@ -22,7 +22,7 @@ class EventsControllerTest < ActionDispatch::IntegrationTest
     get events_path
 
     assert_select "div.events__time-block[style='grid-area: 22/2']" do
-      assert_select "strong", text: "David assigned JZ to Layout is broken"
+      assert_select "strong", text: "David assigned JZ to \"Layout is broken\""
     end
   end