Merge branch 'main' into default-collection
* main: Need a user for this We can't rely on count now so test that the specific collection no longer exists Accounts always start with a "Cards" collection Need to name the assignee(s) Adjust for svg icons Display obvious chip when filtering by stage Need to name the assignee(s) Adjust for svg icons Display obvious chip when filtering by stage Use black for completed card color
This commit is contained in:
@@ -159,6 +159,7 @@
|
||||
|
||||
/* Colors: Cards */
|
||||
--color-card-default: oklch(var(--lch-blue-dark));
|
||||
--color-card-complete: var(--color-ink);
|
||||
--color-card-1: oklch(var(--lch-ink-medium));
|
||||
--color-card-2: oklch(var(--lch-uncolor-medium));
|
||||
--color-card-3: oklch(var(--lch-yellow-medium));
|
||||
|
||||
@@ -266,7 +266,7 @@
|
||||
|
||||
.card:has(&),
|
||||
.card-perma:has(&) {
|
||||
--card-color: var(--card-color-1) !important;
|
||||
--card-color: var(--color-card-complete) !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
place-content: center;
|
||||
margin-inline-end: -0.75em;
|
||||
|
||||
img {
|
||||
.icon {
|
||||
block-size: 1.1em;
|
||||
inline-size: 1.1em;
|
||||
grid-area: 1 / 1;
|
||||
|
||||
@@ -78,20 +78,15 @@
|
||||
}
|
||||
|
||||
&:has(input:checked) {
|
||||
--btn-background: var(--color-selected);
|
||||
--btn-background: var(--color-ink-lightest);
|
||||
--btn-color: var(--color-ink);
|
||||
|
||||
img {
|
||||
filter: invert(0);
|
||||
|
||||
.icon {
|
||||
&.checked {
|
||||
block-size: 1em;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
img {
|
||||
filter: invert(1);
|
||||
inline-size: 1em;
|
||||
margin-inline-end: var(--inline-space);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,11 +96,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
img.checked {
|
||||
block-size: 1em;
|
||||
inline-size: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
.popup__list {
|
||||
|
||||
@@ -2,7 +2,7 @@ module NotificationsHelper
|
||||
def event_notification_title(event)
|
||||
case event_notification_action(event)
|
||||
when "comment_created" then "RE: " + event.eventable.card.title
|
||||
when "card_assigned" then "Assigned to you: " + event.eventable.title
|
||||
when "card_assigned" then "Assigned to #{event.assignees.pluck(:name).to_sentence}: " + event.eventable.title
|
||||
else event.eventable.title
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
<%= render "filters/tags", filter: filter %>
|
||||
<%= render "filters/assignees", filter: filter %>
|
||||
<%= render "filters/creators", filter: filter %>
|
||||
<%= render "filters/stages", filter: filter %>
|
||||
|
||||
<% filter.terms.each do |term| %>
|
||||
<%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<% if Workflow.any? %>
|
||||
<% if filter.stages.any? %>
|
||||
<div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
|
||||
<button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
|
||||
<button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
|
||||
<span class="overflow-ellipsis">
|
||||
<% if filter.stages.any? %>
|
||||
<%= filter.stages.map(&:name).to_sentence %>
|
||||
@@ -13,14 +13,14 @@
|
||||
<dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
|
||||
aria-label="In stage…" aria-description="In stage…"
|
||||
data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
|
||||
<strong class="popup__title margin-block-start-half pad-inline-half">In stage…</strong>
|
||||
<strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">In stage…</strong>
|
||||
<%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
|
||||
data: { controller: "form" } do |form| %>
|
||||
<% filter.as_params.except(:stage_ids).each do |key, value| %>
|
||||
<%= filter_hidden_field_tag key, value %>
|
||||
<% end %>
|
||||
|
||||
<% Workflow.first.stages.each do |stage| %>
|
||||
<% filter.stages.first.workflow.stages.each do |stage| %>
|
||||
<div class="btn popup__item">
|
||||
<%= form.check_box :stage_ids, {
|
||||
multiple: true,
|
||||
|
||||
Reference in New Issue
Block a user