Skip to content

Commit b3cfae3

Browse files
committed
Consolidate UI elements from "the stream" and "Considering" to "Maybe?"
1 parent 0bc3ccb commit b3cfae3

10 files changed

Lines changed: 19 additions & 19 deletions

File tree

app/assets/stylesheets/_global.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
--color-terminal-text: var(--color-ink);
206206
--color-terminal-text-light: var(--color-ink-lighter);
207207
--color-golden: oklch(89.1% 0.178 95.7);
208-
--color-considering: oklch(var(--lch-blue-medium));
208+
--color-maybe: oklch(var(--lch-blue-medium));
209209

210210
/* Colors: Cards */
211211
--color-card-default: oklch(var(--lch-blue-dark));

app/assets/stylesheets/blank-slates.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
white-space: nowrap;
1212
}
1313

14-
.cards--considering & {
14+
.cards--maybe & {
1515
background-color: var(--card-bg-color) !important;
1616
}
1717

app/assets/stylesheets/card-columns.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
translate: 0;
129129
transition: translate var(--column-transition-duration) var(--ease-out-overshoot-subtle);
130130

131-
.is-collapsed:not(.cards--considering) & {
131+
.is-collapsed:not(.cards--maybe) & {
132132
translate: 0 var(--column-width-collapsed);
133133
}
134134

@@ -354,7 +354,7 @@
354354
justify-content: center;
355355
}
356356

357-
.cards:is(.cards--considering) &:hover {
357+
.cards:is(.cards--maybe) &:hover {
358358
cursor: unset;
359359
filter: none;
360360
}
@@ -382,7 +382,7 @@
382382
writing-mode: vertical-rl;
383383
}
384384

385-
.cards:not(.is-collapsed, .cards--considering) & {
385+
.cards:not(.is-collapsed, .cards--maybe) & {
386386
align-items: center;
387387
display: flex;
388388
gap: 0.25ch;
@@ -523,11 +523,11 @@
523523
}
524524
}
525525

526-
/* Considering
526+
/* Maybe
527527
/* ------------------------------------------------------------------------ */
528528

529-
.cards--considering {
530-
--card-color: oklch(var(--lch-blue-medium));
529+
.cards--maybe {
530+
--card-color: var(--color-maybe);
531531

532532
position: relative;
533533

@@ -664,7 +664,7 @@
664664
/* -------------------------------------------------------------------------- */
665665

666666
/* Surface a mini bubble if there are cards with bubbles inside */
667-
.cards--considering:has(.bubble:not([hidden])) .cards__expander-title,
667+
.cards--maybe:has(.bubble:not([hidden])) .cards__expander-title,
668668
.cards--doing.is-collapsed:has(.bubble:not([hidden])) .cards__transition-container {
669669
--bubble-color: var(--card-color, oklch(var(--lch-blue-medium)));
670670
--bubble-shape: 54% 46% 61% 39% / 57% 49% 51% 43%;
@@ -685,7 +685,7 @@
685685
}
686686

687687
/* Maybe column: position bubble relative to the title, not the container */
688-
.cards--considering & {
688+
.cards--maybe & {
689689
overflow: visible;
690690
position: relative;
691691

app/assets/stylesheets/print.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
.card--new,
126126
.cards__decoration,
127127
.card-columns:before,
128-
.cards--considering:before {
128+
.cards--maybe:before {
129129
display: none;
130130
}
131131

@@ -140,7 +140,7 @@
140140
padding-inline: 0;
141141
}
142142

143-
.cards--considering {
143+
.cards--maybe {
144144
background: none;
145145
margin: 0;
146146
padding-inline: 1ch;

app/views/boards/show/_columns.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<%= render "boards/show/not_now", board: board %>
2424
</div>
2525

26-
<%= render "boards/show/stream", board: board, page: page %>
26+
<%= render "boards/show/maybe", board: board, page: page %>
2727

2828
<div class="card-columns__right">
2929
<%= render partial: "boards/show/column", collection: board.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= column_tag id: "the-stream", name: "Maybe?", drop_url: columns_card_drops_stream_path("__id__"), collapsed: false, selected: "true", class: "cards--considering" do %>
1+
<%= column_tag id: "maybe", name: "Maybe?", drop_url: columns_card_drops_stream_path("__id__"), collapsed: false, selected: "true", class: "cards--maybe" do %>
22
<header class="cards__header">
33
<div class="cards__expander">
44
<h2 class="cards__expander-title" data-collapsible-columns-target="title">Maybe?</h2>
@@ -10,7 +10,7 @@
1010
</header>
1111
<%= render "columns/show/add_card_button", board: board %>
1212
<% if page.used? %>
13-
<%= with_automatic_pagination "the-stream", @page do %>
13+
<%= with_automatic_pagination "maybe", @page do %>
1414
<%= render "boards/columns/list", cards: page.records, draggable: true %>
1515
<% end %>
1616
<% else %>

app/views/boards/show/_mobile_columns.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</div>
1313
<% end %>
1414

15-
<%= link_to board_columns_stream_path(board), class: "cards cards--considering is-collapsed", data: { turbo_frame: "_top" } do %>
15+
<%= link_to board_columns_stream_path(board), class: "cards cards--maybe is-collapsed", data: { turbo_frame: "_top" } do %>
1616
<div class="cards__expander btn btn--plain" style="--card-count: <%= board.cards.awaiting_triage.count %>">
1717
<span class="cards__expander-count"><%= board.cards.awaiting_triage.count %></span>
1818
<h2 class="cards__expander-title">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= turbo_stream.replace("the-stream", partial: "boards/show/stream", method: :morph, locals:{ board: @card.board, page: @page }) %>
1+
<%= turbo_stream.replace("maybe", partial: "boards/show/maybe", method: :morph, locals:{ board: @card.board, page: @page }) %>

app/views/public/boards/show/_columns.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<%= render "public/boards/show/not_now", board: board %>
1111
</div>
1212

13-
<%= render "public/boards/show/stream", board: board, page: page %>
13+
<%= render "public/boards/show/maybe", board: board, page: page %>
1414

1515
<div class="card-columns__right">
1616
<%= render partial: "public/boards/show/column", collection: board.columns, cached: true %>

app/views/public/boards/show/_stream.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<section id="the-stream" class="cards cards--considering" data-column-name="Maybe?"
1+
<section id="maybe" class="cards cards--maybe" data-column-name="Maybe?"
22
data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle">
33
<div class="cards__transition-container">
44
<header class="cards__header">

0 commit comments

Comments
 (0)