From 52c49d99c036bb64c4b9d8c8ccb4f51f9c75e280 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Wed, 5 Nov 2025 12:47:27 -0600
Subject: [PATCH] Cleanup after merging from Main

---
 app/views/boards/show/_columns.html.erb | 26 +++++++++++++------------
 app/views/boards/show/_stream.html.erb  |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/views/boards/show/_columns.html.erb b/app/views/boards/show/_columns.html.erb
index a2a406aff..5223b9254 100644
--- a/app/views/boards/show/_columns.html.erb
+++ b/app/views/boards/show/_columns.html.erb
@@ -1,26 +1,28 @@
-<%= tag.div data: {
-      controller: "drag-and-drop drag-and-strum",
+<%= tag.div class: "card-columns", data: {
+      controller: "collapsible-columns drag-and-drop drag-and-strum",
       drag_and_drop_dragged_item_class: "drag-and-drop__dragged-item",
       drag_and_drop_hover_container_class: "drag-and-drop__hover-container",
+      collapsible_columns_board_value: board.id,
+      collapsible_columns_collapsed_class: "is-collapsed",
+      collapsible_columns_no_transitions_class: "no-transitions",
+      collapsible_columns_title_not_visible_class: "is-off-screen",
       action: "
         dragstart->drag-and-drop#dragStart
         dragover->drag-and-drop#dragOver
         dragenter->drag-and-strum#dragEnter
         drop->drag-and-drop#drop
         dragend->drag-and-drop#dragEnd" } do %>
-  <div class="card-columns" data-controller="collapsible-columns" data-collapsible-columns-board-value="<%= board.id %>" data-collapsible-columns-collapsed-class="is-collapsed" data-collapsible-columns-no-transitions-class="no-transitions">
-    <div class="card-columns__left">
-      <%= render "boards/show/not_now", board: board %>
-    </div>
+  <div class="card-columns__left">
+    <%= render "boards/show/not_now", board: board %>
+  </div>
 
-    <%= render "boards/show/stream", board: board, page: page %>
+  <%= render "boards/show/stream", board: board, page: page %>
 
-    <div class="card-columns__right">
-      <%= render partial: "boards/show/column", collection: board.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %>
-      <%= render "boards/show/closed", board: board %>
+  <div class="card-columns__right">
+    <%= render partial: "boards/show/column", collection: board.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %>
+    <%= render "boards/show/closed", board: board %>
 
-      <%= render "boards/show/menu/columns", board: board %>
-    </div>
+    <%= render "boards/show/menu/columns", board: board %>
   </div>
 <% end %>
 
diff --git a/app/views/boards/show/_stream.html.erb b/app/views/boards/show/_stream.html.erb
index ed3aba323..5d5f6508f 100644
--- a/app/views/boards/show/_stream.html.erb
+++ b/app/views/boards/show/_stream.html.erb
@@ -6,7 +6,7 @@
   <div class="cards__transition-container">
     <header class="cards__header">
       <div class="cards__expander">
-        <h2 class="cards__expander-title position-relative">Maybe?</h2>
+        <h2 class="cards__expander-title position-relative" data-collapsible-columns-target="title">Maybe?</h2>
         <%= link_to board_columns_stream_path(board), class: "cards__expander-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %>
           <%= icon_tag "expand", class: "translucent" %>
           <span class="for-screen-reader">Expand column</span>