diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index bad92d206..558b3d9fd 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -362,12 +362,10 @@ .card__move-button { --btn-background: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink)); - --btn-border-radius: 0.2em; margin-block-start: calc(var(--block-space) * 1.2); margin-inline-end: calc(var(--inline-space) * -4); - padding-inline-start: var(--inline-space); - transform: skewX(-15deg); + padding-inline-end: var(--inline-space); } .card__stages { diff --git a/app/helpers/bubbles_helper.rb b/app/helpers/bubbles_helper.rb index 42e85cec7..22f319362 100644 --- a/app/helpers/bubbles_helper.rb +++ b/app/helpers/bubbles_helper.rb @@ -21,8 +21,4 @@ module BubblesHelper } end end - - def editable_bubble_stage?(bubble) - !bubble.popped? && bubble.doing? - end end diff --git a/app/models/bubble/engageable.rb b/app/models/bubble/engageable.rb index cd72947b2..5a11a5b06 100644 --- a/app/models/bubble/engageable.rb +++ b/app/models/bubble/engageable.rb @@ -6,8 +6,8 @@ module Bubble::Engageable included do has_one :engagement, dependent: :destroy, class_name: "Bubble::Engagement" - scope :doing, -> { active.joins(:engagement) } - scope :considering, -> { active.where.missing(:engagement) } + scope :doing, -> { published.active.joins(:engagement) } + scope :considering, -> { published.active.where.missing(:engagement) } scope :stagnated, -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) } end @@ -25,11 +25,11 @@ module Bubble::Engageable end def doing? - active? && engagement.present? + active? && published? && engagement.present? end def considering? - active? && !doing? + active? && published? && !doing? end def engage diff --git a/app/views/bubbles/cards/_mini.html.erb b/app/views/bubbles/cards/_mini.html.erb index 50813807d..234326793 100644 --- a/app/views/bubbles/cards/_mini.html.erb +++ b/app/views/bubbles/cards/_mini.html.erb @@ -3,7 +3,7 @@