From 8627f8829f005fcc4a6400daa9009c4a87bea32c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 1 Oct 2025 13:24:29 -0500
Subject: [PATCH 1/4] Prefer single key hotkeys

We'll still support cmd/ctrl + J for legacy muscle memory but new
customer should just use `J`
---
 app/views/filters/menu/_button.html.erb          | 2 +-
 app/views/filters/menu/_shortcut_notice.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/filters/menu/_button.html.erb b/app/views/filters/menu/_button.html.erb
index b9f2e1835..3324272d3 100644
--- a/app/views/filters/menu/_button.html.erb
+++ b/app/views/filters/menu/_button.html.erb
@@ -1,6 +1,6 @@
 <%= tag.button class:"fizzy-menu-trigger input input--select center flex-inline align-center txt-normal",
       data: {
-            action: "click->dialog#open:stop keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
+            action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
             controller: "hotkey" } do %>
   <svg fill="none" height="282" viewBox="0 0 178 282" width="178" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <path d="m14.1582 85.2218s66.3075-9.7823 75.9322-9.7823c9.6242 0 73.9516 9.7823 73.9516 9.7823-6.535 65.4602-17.171 132.0422-21.661 160.5982 0 0-16.941 11.257-51.3278 11.257s-55.9319-12.654-55.9319-12.654c-4.4901-28.557-14.4184-93.741-20.9631-159.2012z" fill="#d2edf8"/>
diff --git a/app/views/filters/menu/_shortcut_notice.html.erb b/app/views/filters/menu/_shortcut_notice.html.erb
index f4c28b43f..b594b19a0 100644
--- a/app/views/filters/menu/_shortcut_notice.html.erb
+++ b/app/views/filters/menu/_shortcut_notice.html.erb
@@ -1,5 +1,5 @@
 <% if platform.desktop? %>
   <footer class="popup__footer">
-    Press <kbd class="kbd"><%= hotkey_label(["ctrl", "J"]) -%></kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">SHIFT+ENTER</kbd> to select.
+    Press <kbd class="kbd">J</kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">SHIFT+ENTER</kbd> to select.
   </footer>
 <% end %>

From ca81e2aa36a74bda0336cd1fa881a09e07f6001b Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 1 Oct 2025 13:31:17 -0500
Subject: [PATCH 2/4] Prevent card bubbles getting clipped in grid layout

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

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index b6753394e..f4ff6ac05 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -73,7 +73,7 @@
       z-index: 3;
     }
 
-    &:not(.cards--considering, .is-collapsed) {
+    &:not(.cards--considering, .is-collapsed, .cards--grid) {
       overflow: clip;
     }
 

From 3ae82da19ef63cbd5645da1c602766c6d720aa17 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 1 Oct 2025 13:32:15 -0500
Subject: [PATCH 3/4] No longer needed

---
 app/views/collections/edit.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index b6b0efe6c..39518d583 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -38,7 +38,6 @@
   </div>
 
   <div class="settings__panel panel shadow center">
-    <%# render "collections/edit/workflows", collection: @collection %>
     <%= render "collections/edit/auto_close", collection: @collection %>
     <%= render "collections/edit/publication", collection: @collection %>
     <%= render "collections/edit/delete", collection: @collection %>

From 935c503ac5acb1e1c4ce7d5e172436a9e57d8544 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 1 Oct 2025 13:33:38 -0500
Subject: [PATCH 4/4] Replace old link with proper collection path

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

diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 39518d583..f565cc972 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <%= render "filters/menu", user_filtering: @user_filtering %>
   <div class="header__actions header__actions--start">
-    <%= link_to cards_path(collection_ids: [ @collection ]), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
+    <%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
       <span class="overflow-ellipsis">
         &larr;
         <strong><%= @collection.name %></strong>