From b3cfae352975ddcaf4031cd6cfa4de842e8ca0ec Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 12 Dec 2025 12:29:01 -0600 Subject: [PATCH] Consolidate UI elements from "the stream" and "Considering" to "Maybe?" --- app/assets/stylesheets/_global.css | 2 +- app/assets/stylesheets/blank-slates.css | 2 +- app/assets/stylesheets/card-columns.css | 16 ++++++++-------- app/assets/stylesheets/print.css | 4 ++-- app/views/boards/show/_columns.html.erb | 2 +- .../show/{_stream.html.erb => _maybe.html.erb} | 4 ++-- app/views/boards/show/_mobile_columns.html.erb | 2 +- .../cards/drops/streams/create.turbo_stream.erb | 2 +- app/views/public/boards/show/_columns.html.erb | 2 +- app/views/public/boards/show/_stream.html.erb | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) rename app/views/boards/show/{_stream.html.erb => _maybe.html.erb} (76%) diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css index dc928b40d..213d921e4 100644 --- a/app/assets/stylesheets/_global.css +++ b/app/assets/stylesheets/_global.css @@ -205,7 +205,7 @@ --color-terminal-text: var(--color-ink); --color-terminal-text-light: var(--color-ink-lighter); --color-golden: oklch(89.1% 0.178 95.7); - --color-considering: oklch(var(--lch-blue-medium)); + --color-maybe: oklch(var(--lch-blue-medium)); /* Colors: Cards */ --color-card-default: oklch(var(--lch-blue-dark)); diff --git a/app/assets/stylesheets/blank-slates.css b/app/assets/stylesheets/blank-slates.css index 0725dd336..3c36b30da 100644 --- a/app/assets/stylesheets/blank-slates.css +++ b/app/assets/stylesheets/blank-slates.css @@ -11,7 +11,7 @@ white-space: nowrap; } - .cards--considering & { + .cards--maybe & { background-color: var(--card-bg-color) !important; } diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index c239e1b9d..6d6011906 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -128,7 +128,7 @@ translate: 0; transition: translate var(--column-transition-duration) var(--ease-out-overshoot-subtle); - .is-collapsed:not(.cards--considering) & { + .is-collapsed:not(.cards--maybe) & { translate: 0 var(--column-width-collapsed); } @@ -354,7 +354,7 @@ justify-content: center; } - .cards:is(.cards--considering) &:hover { + .cards:is(.cards--maybe) &:hover { cursor: unset; filter: none; } @@ -382,7 +382,7 @@ writing-mode: vertical-rl; } - .cards:not(.is-collapsed, .cards--considering) & { + .cards:not(.is-collapsed, .cards--maybe) & { align-items: center; display: flex; gap: 0.25ch; @@ -523,11 +523,11 @@ } } - /* Considering + /* Maybe /* ------------------------------------------------------------------------ */ - .cards--considering { - --card-color: oklch(var(--lch-blue-medium)); + .cards--maybe { + --card-color: var(--color-maybe); position: relative; @@ -664,7 +664,7 @@ /* -------------------------------------------------------------------------- */ /* Surface a mini bubble if there are cards with bubbles inside */ - .cards--considering:has(.bubble:not([hidden])) .cards__expander-title, + .cards--maybe:has(.bubble:not([hidden])) .cards__expander-title, .cards--doing.is-collapsed:has(.bubble:not([hidden])) .cards__transition-container { --bubble-color: var(--card-color, oklch(var(--lch-blue-medium))); --bubble-shape: 54% 46% 61% 39% / 57% 49% 51% 43%; @@ -685,7 +685,7 @@ } /* Maybe column: position bubble relative to the title, not the container */ - .cards--considering & { + .cards--maybe & { overflow: visible; position: relative; diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index c79493458..f700b9332 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -125,7 +125,7 @@ .card--new, .cards__decoration, .card-columns:before, - .cards--considering:before { + .cards--maybe:before { display: none; } @@ -140,7 +140,7 @@ padding-inline: 0; } - .cards--considering { + .cards--maybe { background: none; margin: 0; padding-inline: 1ch; diff --git a/app/views/boards/show/_columns.html.erb b/app/views/boards/show/_columns.html.erb index a6001da79..34f926bfc 100644 --- a/app/views/boards/show/_columns.html.erb +++ b/app/views/boards/show/_columns.html.erb @@ -23,7 +23,7 @@ <%= render "boards/show/not_now", board: board %> - <%= render "boards/show/stream", board: board, page: page %> + <%= render "boards/show/maybe", board: board, page: page %>
<%= render partial: "boards/show/column", collection: board.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %> diff --git a/app/views/boards/show/_stream.html.erb b/app/views/boards/show/_maybe.html.erb similarity index 76% rename from app/views/boards/show/_stream.html.erb rename to app/views/boards/show/_maybe.html.erb index d4753eba5..6fb46b7b5 100644 --- a/app/views/boards/show/_stream.html.erb +++ b/app/views/boards/show/_maybe.html.erb @@ -1,4 +1,4 @@ -<%= column_tag id: "the-stream", name: "Maybe?", drop_url: columns_card_drops_stream_path("__id__"), collapsed: false, selected: "true", class: "cards--considering" do %> +<%= column_tag id: "maybe", name: "Maybe?", drop_url: columns_card_drops_stream_path("__id__"), collapsed: false, selected: "true", class: "cards--maybe" do %>

Maybe?

@@ -10,7 +10,7 @@
<%= render "columns/show/add_card_button", board: board %> <% if page.used? %> - <%= with_automatic_pagination "the-stream", @page do %> + <%= with_automatic_pagination "maybe", @page do %> <%= render "boards/columns/list", cards: page.records, draggable: true %> <% end %> <% else %> diff --git a/app/views/boards/show/_mobile_columns.html.erb b/app/views/boards/show/_mobile_columns.html.erb index 964d75220..e8f5938ae 100644 --- a/app/views/boards/show/_mobile_columns.html.erb +++ b/app/views/boards/show/_mobile_columns.html.erb @@ -12,7 +12,7 @@
<% end %> - <%= link_to board_columns_stream_path(board), class: "cards cards--considering is-collapsed", data: { turbo_frame: "_top" } do %> + <%= link_to board_columns_stream_path(board), class: "cards cards--maybe is-collapsed", data: { turbo_frame: "_top" } do %>
<%= board.cards.awaiting_triage.count %>

diff --git a/app/views/columns/cards/drops/streams/create.turbo_stream.erb b/app/views/columns/cards/drops/streams/create.turbo_stream.erb index 3f6251645..3141b847f 100644 --- a/app/views/columns/cards/drops/streams/create.turbo_stream.erb +++ b/app/views/columns/cards/drops/streams/create.turbo_stream.erb @@ -1 +1 @@ -<%= turbo_stream.replace("the-stream", partial: "boards/show/stream", method: :morph, locals:{ board: @card.board, page: @page }) %> +<%= turbo_stream.replace("maybe", partial: "boards/show/maybe", method: :morph, locals:{ board: @card.board, page: @page }) %> diff --git a/app/views/public/boards/show/_columns.html.erb b/app/views/public/boards/show/_columns.html.erb index 59f2b5e39..de0948491 100644 --- a/app/views/public/boards/show/_columns.html.erb +++ b/app/views/public/boards/show/_columns.html.erb @@ -10,7 +10,7 @@ <%= render "public/boards/show/not_now", board: board %>

- <%= render "public/boards/show/stream", board: board, page: page %> + <%= render "public/boards/show/maybe", board: board, page: page %>
<%= render partial: "public/boards/show/column", collection: board.columns, cached: true %> diff --git a/app/views/public/boards/show/_stream.html.erb b/app/views/public/boards/show/_stream.html.erb index 8fea976b6..9d041c1cd 100644 --- a/app/views/public/boards/show/_stream.html.erb +++ b/app/views/public/boards/show/_stream.html.erb @@ -1,4 +1,4 @@ -