From 98f9ba55122f888a81b112818f9fbe17b27d3280 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Jul 2025 15:14:33 -0500 Subject: [PATCH 1/4] Allow cards in Considering to gilded --- app/assets/stylesheets/cards.css | 2 +- app/helpers/cards_helper.rb | 1 + app/views/cards/_container.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 82151afcc..96328307d 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -345,7 +345,7 @@ /* Variants /* ------------------------------------------------------------------------ */ - .card--golden.card--doing { + .card--golden:is(.card--doing, .card--considering) { --lch-golden: 89.1% 0.178 95.7; background-color: var(--color-canvas); diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb index cb72bffd2..985f5a553 100644 --- a/app/helpers/cards_helper.rb +++ b/app/helpers/cards_helper.rb @@ -35,6 +35,7 @@ module CardsHelper classes = [ options.delete(:class), ("card--golden" if card.golden?), + ("card--considering" if card.considering?), ("card--doing" if card.doing?), ("card--drafted" if card.drafted?) ].compact.join(" ") diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb index df7d6c917..42f345bee 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -3,7 +3,7 @@ <%= render "cards/container/engagement", card: card %> From 9e3a414d3008239d3b8accc108a14c14f7fbcca5 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Jul 2025 15:29:36 -0500 Subject: [PATCH 2/4] Adjust card collection header when colored golden --- app/assets/stylesheets/cards.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 96328307d..f58edc90f 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -363,6 +363,21 @@ @media (prefers-color-scheme: dark) { --lch-golden: var(--lch-blue-medium); } + + &.card--considering { + .card__collection { + background-color: oklch(var(--lch-golden)); + color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); + } + + .card__collection-name { + border-color: color-mix(in srgb, var(--color-ink) 33%, oklch(var(--lch-golden))); + } + + .card__header { + margin-inline: calc(-1 * var(--card-padding-inline)) calc(-0.5 * var(--card-padding-inline)); + } + } } .card--notification { From c66261d30f85cda2dbbc707707586d9cb2ba1c4e Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Jul 2025 15:35:05 -0500 Subject: [PATCH 3/4] Golden cards bubble to the top of Considering, too --- app/models/card/engageable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb index cf8142934..7d26308a2 100644 --- a/app/models/card/engageable.rb +++ b/app/models/card/engageable.rb @@ -9,7 +9,7 @@ module Card::Engageable scope :by_engagement_status, ->(status) do case status.to_s - when "considering" then considering + when "considering" then considering.with_golden_first when "doing" then doing.with_golden_first end end From 0d3be8ed7eb2e73a7b894e0819dd82e59efec1d8 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Jul 2025 15:57:28 -0500 Subject: [PATCH 4/4] Don't color the collection header in considering --- app/assets/stylesheets/cards.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index f58edc90f..7debb7821 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -366,17 +366,13 @@ &.card--considering { .card__collection { - background-color: oklch(var(--lch-golden)); + background-color: transparent; color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); } .card__collection-name { border-color: color-mix(in srgb, var(--color-ink) 33%, oklch(var(--lch-golden))); } - - .card__header { - margin-inline: calc(-1 * var(--card-padding-inline)) calc(-0.5 * var(--card-padding-inline)); - } } }