Cleanup after merging from Main

This commit is contained in:
Andy Smith
2025-11-05 12:47:27 -06:00
parent 8280be59c5
commit 52c49d99c0
2 changed files with 15 additions and 13 deletions
+14 -12
View File
@@ -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 %>
+1 -1
View File
@@ -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>