diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css index 48ab4782c..d6d7712fc 100644 --- a/app/assets/stylesheets/_global.css +++ b/app/assets/stylesheets/_global.css @@ -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)); diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 4529a3c05..0e3e4a1ff 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -266,7 +266,7 @@ .card:has(&), .card-perma:has(&) { - --card-color: var(--card-color-1) !important; + --card-color: var(--color-card-complete) !important; } } diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index 849540e5b..f4f280412 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -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; diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css index 45db824ae..6f7794b5b 100644 --- a/app/assets/stylesheets/popup.css +++ b/app/assets/stylesheets/popup.css @@ -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 { diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 13125cdad..3baaf7aab 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -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 diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb index 76dd3f1f8..850cd786e 100644 --- a/app/views/filters/_settings.html.erb +++ b/app/views/filters/_settings.html.erb @@ -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) %> diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb index 0172b0130..d20e8fc86 100644 --- a/app/views/filters/_stages.html.erb +++ b/app/views/filters/_stages.html.erb @@ -1,6 +1,6 @@ -<% if Workflow.any? %> +<% if filter.stages.any? %>